Skip to content

http: restore bad response status handling in file fetch #114

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
merged 2 commits into from
Jan 20, 2023
Merged

http: restore bad response status handling in file fetch #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4004216
http: restore bad response status handling in file fetch
itzg Jan 20, 2023
4f10dbd
Fixed not-modified case
itzg Jan 20, 2023
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
15 changes: 15 additions & 0 deletions src/main/java/me/itzg/helpers/http/FailedRequestException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package me.itzg.helpers.http;

import io.netty.handler.codec.http.HttpResponseStatus;
import java.net.URI;
import lombok.Getter;
import org.apache.hc.client5.http.HttpResponseException;
Expand All @@ -11,11 +12,25 @@ public class FailedRequestException extends RuntimeException {
@Getter
private final int statusCode;

/**
* Apache HTTP Client flavor
*/
public FailedRequestException(HttpResponseException e, URI uri) {
super(
String.format("HTTP request failed uri: %s %s", uri, e.getMessage())
);
this.uri = uri;
this.statusCode = e.getStatusCode();
}

/**
* Reactor Netty flavor
*/
public FailedRequestException(HttpResponseStatus status, URI uri, String msg) {
super(
String.format("HTTP request failed uri: %s %s", uri, msg)
);
this.uri = uri;
this.statusCode = status.code();
}
}
20 changes: 15 additions & 5 deletions src/main/java/me/itzg/helpers/http/SpecificFileFetchBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
import static io.netty.handler.codec.http.HttpResponseStatus.NOT_MODIFIED;
import static java.util.Objects.requireNonNull;

import io.netty.handler.codec.http.HttpResponseStatus;
import io.netty.handler.codec.http.HttpStatusClass;
import java.io.IOException;
import java.net.URI;
import java.nio.file.Files;
Expand Down Expand Up @@ -108,19 +110,27 @@ public Mono<Path> assemble() {
.doOnRequest(debugLogRequest(log, "file fetch"))
.get()
.uri(uri)
.responseSingle((httpClientResponse, bodyMono) -> {
if (useIfModifiedSince
&& httpClientResponse.status().equals(NOT_MODIFIED)) {
.responseSingle((resp, bodyMono) -> {
final HttpResponseStatus status = resp.status();

if (useIfModifiedSince && status.equals(NOT_MODIFIED)) {
return Mono.just(file);
}

if (HttpStatusClass.valueOf(status.code()) != HttpStatusClass.SUCCESS) {
return Mono.error(new FailedRequestException(status, uri, "Trying to retrieve file"));
}

final List<String> contentTypes = getAcceptContentTypes();
if (contentTypes != null && !contentTypes.isEmpty()) {
final List<String> respTypes = httpClientResponse.responseHeaders()
final List<String> respTypes = resp.responseHeaders()
.getAll(CONTENT_TYPE);
if (respTypes.stream()
.noneMatch(contentTypes::contains)) {
return Mono.error(new GenericException("Unexpected content type in response"));
return Mono.error(new GenericException(
String.format("Unexpected content type in response. Expected '%s' but got '%s'",
contentTypes, respTypes
)));
}
}

Expand Down