Skip to content

Ensure 304 response code does not throw exceptions #1975

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
baywet merged 5 commits into from
Jul 4, 2025
Merged

Ensure 304 response code does not throw exceptions #1975

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
893b753
Initial plan
Copilot Jul 2, 2025
bb66b47
Ensure 304 response code does not throw exceptions
Copilot Jul 2, 2025
7c72810
Use range comparison for 3xx status codes and include 205
Copilot Jul 2, 2025
be819a9
chore: proper range comparison
baywet Jul 2, 2025
f440dcb
chore: formatting
baywet Jul 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions components/http/okHttp/src/main/java/com/microsoft/kiota/http/OkHttpRequestAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,9 @@ private void setResponseType(final Object result, final Span span) {
}

private void closeResponse(boolean closeResponse, Response response) {
if (closeResponse && response.code() != 204) {
if (closeResponse
&& response.code() != 204
&& (response.code() < 300 || response.code() > 399)) {
response.close();
}
}
Expand Down Expand Up @@ -614,7 +616,7 @@ private void closeResponse(boolean closeResponse, Response response) {

private boolean shouldReturnNull(final Response response) {
final int statusCode = response.code();
return statusCode == 204;
return statusCode == 204 || (statusCode > 299 && statusCode < 400);
}

/**
Expand Down
4 changes: 2 additions & 2 deletions components/http/okHttp/src/test/java/com/microsoft/kiota/http/OkHttpRequestAdapterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ void sendStreamReturnsUsableStream(int statusCode) throws Exception {
}

@ParameterizedTest
@ValueSource(ints = {200, 201, 202, 203, 204})
@ValueSource(ints = {200, 201, 202, 203, 204, 304})
void sendStreamReturnsNullOnNoContent(int statusCode) throws Exception {
final var authenticationProviderMock = mock(AuthenticationProvider.class);
authenticationProviderMock.authenticateRequest(
Expand Down Expand Up @@ -149,7 +149,7 @@ void sendStreamReturnsNullOnNoContent(int statusCode) throws Exception {
}

@ParameterizedTest
@ValueSource(ints = {200, 201, 202, 203, 204, 205})
@ValueSource(ints = {200, 201, 202, 203, 204, 205, 304})
void sendReturnsNullOnNoContent(int statusCode) throws Exception {
final var authenticationProviderMock = mock(AuthenticationProvider.class);
authenticationProviderMock.authenticateRequest(
Expand Down