Skip to content

Commit

Permalink
Naming
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelklishin committed Dec 2, 2024
1 parent f2943f1 commit 4dedde2
Showing 1 changed file with 24 additions and 24 deletions.
48 changes: 24 additions & 24 deletions src/blocking.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1017,8 +1017,8 @@ where
fn http_get<S>(
&self,
path: S,
client_expect_code_error: Option<StatusCode>,
server_expect_code_error: Option<StatusCode>,
client_code_to_accept_or_ignore: Option<StatusCode>,
server_code_to_accept_or_ignore: Option<StatusCode>,
) -> Result<HttpClientResponse>
where
S: AsRef<str>,
Expand All @@ -1030,8 +1030,8 @@ where
.send()?;
let response = self.ok_or_status_code_error(
response,
client_expect_code_error,
server_expect_code_error,
client_code_to_accept_or_ignore,
server_code_to_accept_or_ignore,
)?;
Ok(response)
}
Expand All @@ -1040,8 +1040,8 @@ where
&self,
path: S,
payload: &T,
client_expect_code_error: Option<StatusCode>,
server_expect_code_error: Option<StatusCode>,
client_code_to_accept_or_ignore: Option<StatusCode>,
server_code_to_accept_or_ignore: Option<StatusCode>,
) -> Result<HttpClientResponse>
where
S: AsRef<str>,
Expand All @@ -1055,8 +1055,8 @@ where
.send()?;
let response = self.ok_or_status_code_error(
response,
client_expect_code_error,
server_expect_code_error,
client_code_to_accept_or_ignore,
server_code_to_accept_or_ignore,
)?;
Ok(response)
}
Expand All @@ -1065,8 +1065,8 @@ where
&self,
path: S,
payload: &T,
client_expect_code_error: Option<StatusCode>,
server_expect_code_error: Option<StatusCode>,
client_code_to_accept_or_ignore: Option<StatusCode>,
server_code_to_accept_or_ignore: Option<StatusCode>,
) -> Result<HttpClientResponse>
where
S: AsRef<str>,
Expand All @@ -1080,17 +1080,17 @@ where
.send()?;
let response = self.ok_or_status_code_error(
response,
client_expect_code_error,
server_expect_code_error,
client_code_to_accept_or_ignore,
server_code_to_accept_or_ignore,
)?;
Ok(response)
}

fn http_delete<S>(
&self,
path: S,
client_expect_code_error: Option<StatusCode>,
server_expect_code_error: Option<StatusCode>,
client_code_to_accept_or_ignore: Option<StatusCode>,
server_code_to_accept_or_ignore: Option<StatusCode>,
) -> Result<HttpClientResponse>
where
S: AsRef<str>,
Expand All @@ -1102,8 +1102,8 @@ where
.send()?;
let response = self.ok_or_status_code_error(
response,
client_expect_code_error,
server_expect_code_error,
client_code_to_accept_or_ignore,
server_code_to_accept_or_ignore,
)?;
Ok(response)
}
Expand All @@ -1112,8 +1112,8 @@ where
&self,
path: S,
headers: HeaderMap,
client_expect_code_error: Option<StatusCode>,
server_expect_code_error: Option<StatusCode>,
client_code_to_accept_or_ignore: Option<StatusCode>,
server_code_to_accept_or_ignore: Option<StatusCode>,
) -> Result<HttpClientResponse>
where
S: AsRef<str>,
Expand All @@ -1126,28 +1126,28 @@ where
.send()?;
let response = self.ok_or_status_code_error(
response,
client_expect_code_error,
server_expect_code_error,
client_code_to_accept_or_ignore,
server_code_to_accept_or_ignore,
)?;
Ok(response)
}

fn ok_or_status_code_error(
&self,
response: HttpClientResponse,
client_expect_code_error: Option<StatusCode>,
server_expect_code_error: Option<StatusCode>,
client_code_to_accept_or_ignore: Option<StatusCode>,
server_code_to_accept_or_ignore: Option<StatusCode>,
) -> Result<HttpClientResponse> {
let status = response.status();
if status.is_client_error() {
match client_expect_code_error {
match client_code_to_accept_or_ignore {
Some(expect) if status == expect => {}
_ => return Err(Error::ClientErrorResponse(status, response)),
}
}

if status.is_server_error() {
match server_expect_code_error {
match server_code_to_accept_or_ignore {
Some(expect) if status == expect => {}
_ => return Err(Error::ServerErrorResponse(status, response)),
}
Expand Down

0 comments on commit 4dedde2

Please sign in to comment.