Skip to content

⬆️ 💥 migrate to http-core 5 #233

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
sebastianMindee merged 5 commits into from
Apr 14, 2025
Merged

⬆️ 💥 migrate to http-core 5 #233

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
ca03041
:arrow_up: :boom: migrate to http-core 5
ianardee Apr 9, 2025
8c9cb67
fix import ordering
sebastianMindee Apr 9, 2025
baa526e
properly update usage of http 5.x
sebastianMindee Apr 10, 2025
a59b030
update wiremock dependency to standalone
sebastianMindee Apr 10, 2025
59b905b
re-downgrade wiremock
sebastianMindee Apr 10, 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
15 changes: 12 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,16 @@
<version>${org.projectlombok.version}</version>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${org.slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>${org.slf4j.version}</version>
</dependency>
<dependency>
<artifactId>mockwebserver</artifactId>
<groupId>com.squareup.okhttp3</groupId>
Expand Down Expand Up @@ -375,8 +385,6 @@
<version>${org.hamcrest.version}</version>
<scope>test</scope>
</dependency>


</dependencies>

<scm>
Expand All @@ -393,7 +401,7 @@
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<org.apache.commons.math3.version>3.6.1</org.apache.commons.math3.version>
<org.apache.httpcomponents.client5.httpclient5.version>5.2.3</org.apache.httpcomponents.client5.httpclient5.version>
<org.apache.httpcomponents.client5.httpclient5.version>5.4.2</org.apache.httpcomponents.client5.httpclient5.version>
<org.apache.httpcomponents.httpmime.version>4.5.14</org.apache.httpcomponents.httpmime.version>
<org.apache.maven.clean.version>3.1.0</org.apache.maven.clean.version>
<org.apache.maven.compiler.version>3.12.1</org.apache.maven.compiler.version>
Expand All @@ -417,6 +425,7 @@
<org.mockito.junit.jupiter.version>4.5.1</org.mockito.junit.jupiter.version>
<org.projectlombok.lombok-mapstruct-binding.version>0.2.0</org.projectlombok.lombok-mapstruct-binding.version>
<org.projectlombok.version>1.18.32</org.projectlombok.version>
<org.slf4j.version>2.0.17</org.slf4j.version>
<org.sonatype.nexus.staging.maven.version>1.6.12</org.sonatype.nexus.staging.maven.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<wiremock.version>2.27.2</wiremock.version>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/mindee/http/MindeeApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import com.mindee.parsing.common.WorkflowResponse;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import org.apache.http.HttpEntity;
import org.apache.hc.core5.http.HttpEntity;

/**
* Defines required methods for an API.
Expand Down
184 changes: 94 additions & 90 deletions src/main/java/com/mindee/http/MindeeHttpApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,20 @@
import java.util.Map;
import java.util.function.Function;
import lombok.Builder;
import org.apache.http.HttpEntity;
import org.apache.http.HttpHeaders;
import org.apache.http.NameValuePair;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.client.utils.URIBuilder;
import org.apache.http.entity.ContentType;
import org.apache.http.entity.StringEntity;
import org.apache.http.entity.mime.HttpMultipartMode;
import org.apache.http.entity.mime.MultipartEntityBuilder;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.message.BasicNameValuePair;
import org.apache.hc.client5.http.classic.methods.HttpGet;
import org.apache.hc.client5.http.classic.methods.HttpPost;
import org.apache.hc.client5.http.entity.mime.HttpMultipartMode;
import org.apache.hc.client5.http.entity.mime.MultipartEntityBuilder;
import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
import org.apache.hc.core5.http.ClassicHttpResponse;
import org.apache.hc.core5.http.ContentType;
import org.apache.hc.core5.http.HttpEntity;
import org.apache.hc.core5.http.HttpHeaders;
import org.apache.hc.core5.http.NameValuePair;
import org.apache.hc.core5.http.io.entity.StringEntity;
import org.apache.hc.core5.http.message.BasicNameValuePair;
import org.apache.hc.core5.net.URIBuilder;

/**
* HTTP Client class.
Expand Down Expand Up @@ -152,31 +152,33 @@ public <DocT extends Inference> AsyncPredictResponse<DocT> documentQueueGet(
}
get.setHeader(HttpHeaders.USER_AGENT, getUserAgent());

try (
CloseableHttpClient httpClient = httpClientBuilder.build();
CloseableHttpResponse response = httpClient.execute(get)
) {
HttpEntity responseEntity = response.getEntity();
int statusCode = response.getStatusLine().getStatusCode();
if (!is2xxStatusCode(statusCode)) {
throw getHttpError(parametricType, response);
}
String rawResponse = readRawResponse(responseEntity);
AsyncPredictResponse<DocT> mappedResponse = mapper.readValue(rawResponse, parametricType);
mappedResponse.setRawResponse(rawResponse);
if (
mappedResponse.getJob() != null
&& mappedResponse.getJob().getError() != null
&& mappedResponse.getJob().getError().getCode() != null
) {
throw new MindeeHttpException(
500,
mappedResponse.getJob().getError().getMessage(),
mappedResponse.getJob().getError().getDetails().toString(),
mappedResponse.getJob().getError().getCode()
);
}
return mappedResponse;
try (CloseableHttpClient httpClient = httpClientBuilder.build()) {
return httpClient.execute(
get, response -> {
HttpEntity responseEntity = response.getEntity();
int statusCode = response.getCode();
if (!is2xxStatusCode(statusCode)) {
throw getHttpError(parametricType, response);
}
String rawResponse = readRawResponse(responseEntity);
AsyncPredictResponse<DocT> mappedResponse =
mapper.readValue(rawResponse, parametricType);
mappedResponse.setRawResponse(rawResponse);
if (
mappedResponse.getJob() != null
&& mappedResponse.getJob().getError() != null
&& mappedResponse.getJob().getError().getCode() != null
) {
throw new MindeeHttpException(
500,
mappedResponse.getJob().getError().getMessage(),
mappedResponse.getJob().getError().getDetails().toString(),
mappedResponse.getJob().getError().getCode()
);
}
return mappedResponse;
}
);
} catch (IOException err) {
throw new MindeeException(err.getMessage(), err);
}
Expand All @@ -200,22 +202,23 @@ public <DocT extends Inference> PredictResponse<DocT> predictPost(
PredictResponse.class,
documentClass
);
try (
CloseableHttpClient httpClient = httpClientBuilder.build();
CloseableHttpResponse response = httpClient.execute(post)
) {
HttpEntity responseEntity = response.getEntity();
int statusCode = response.getStatusLine().getStatusCode();
if (!is2xxStatusCode(statusCode)) {
throw getHttpError(parametricType, response);
}
if (responseEntity.getContentLength() == 0) {
throw new MindeeException("Empty response from server.");
}
String rawResponse = readRawResponse(responseEntity);
PredictResponse<DocT> mappedResponse = mapper.readValue(rawResponse, parametricType);
mappedResponse.setRawResponse(rawResponse);
return mappedResponse;
try (CloseableHttpClient httpClient = httpClientBuilder.build()) {
return httpClient.execute(
post, response -> {
HttpEntity responseEntity = response.getEntity();
int statusCode = response.getCode();
if (!is2xxStatusCode(statusCode)) {
throw getHttpError(parametricType, response);
}
if (responseEntity.getContentLength() == 0) {
throw new MindeeException("Empty response from server.");
}
String rawResponse = readRawResponse(responseEntity);
PredictResponse<DocT> mappedResponse = mapper.readValue(rawResponse, parametricType);
mappedResponse.setRawResponse(rawResponse);
return mappedResponse;
}
);
} catch (IOException err) {
throw new MindeeException(err.getMessage(), err);
}
Expand All @@ -239,22 +242,24 @@ public <DocT extends Inference> AsyncPredictResponse<DocT> predictAsyncPost(
AsyncPredictResponse.class,
documentClass
);
try (
CloseableHttpClient httpClient = httpClientBuilder.build();
CloseableHttpResponse response = httpClient.execute(post)
) {
HttpEntity responseEntity = response.getEntity();
int statusCode = response.getStatusLine().getStatusCode();
if (!is2xxStatusCode(statusCode)) {
throw getHttpError(parametricType, response);
}
if (responseEntity.getContentLength() == 0) {
throw new MindeeException("Empty response from server.");
}
String rawResponse = readRawResponse(responseEntity);
AsyncPredictResponse<DocT> mappedResponse = mapper.readValue(rawResponse, parametricType);
mappedResponse.setRawResponse(rawResponse);
return mappedResponse;
try (CloseableHttpClient httpClient = httpClientBuilder.build()) {
return httpClient.execute(
post, response -> {
HttpEntity responseEntity = response.getEntity();
int statusCode = response.getCode();
if (!is2xxStatusCode(statusCode)) {
throw getHttpError(parametricType, response);
}
if (responseEntity.getContentLength() == 0) {
throw new MindeeException("Empty response from server.");
}
String rawResponse = readRawResponse(responseEntity);
AsyncPredictResponse<DocT> mappedResponse =
mapper.readValue(rawResponse, parametricType);
mappedResponse.setRawResponse(rawResponse);
return mappedResponse;
}
);
} catch (IOException err) {
throw new MindeeException(err.getMessage(), err);
}
Expand All @@ -279,22 +284,21 @@ public <DocT extends Inference> WorkflowResponse<DocT> executeWorkflowPost(
WorkflowResponse.class,
documentClass
);
try (
CloseableHttpClient httpClient = httpClientBuilder.build();
CloseableHttpResponse response = httpClient.execute(post)
) {
HttpEntity responseEntity = response.getEntity();
int statusCode = response.getStatusLine().getStatusCode();
if (!is2xxStatusCode(statusCode)) {
throw getHttpError(parametricType, response);
}
if (responseEntity.getContentLength() == 0) {
throw new MindeeException("Empty response from server.");
}
String rawResponse = readRawResponse(responseEntity);
WorkflowResponse<DocT> mappedResponse = mapper.readValue(rawResponse, parametricType);
mappedResponse.setRawResponse(rawResponse);
return mappedResponse;
try (CloseableHttpClient httpClient = httpClientBuilder.build()) {
return httpClient.execute(post, response -> {
HttpEntity responseEntity = response.getEntity();
int statusCode = response.getCode();
if (!is2xxStatusCode(statusCode)) {
throw getHttpError(parametricType, response);
}
if (responseEntity.getContentLength() == 0) {
throw new MindeeException("Empty response from server.");
}
String rawResponse = readRawResponse(responseEntity);
WorkflowResponse<DocT> mappedResponse = mapper.readValue(rawResponse, parametricType);
mappedResponse.setRawResponse(rawResponse);
return mappedResponse;
});
} catch (IOException err) {
throw new MindeeException(err.getMessage(), err);
}
Expand All @@ -303,9 +307,9 @@ public <DocT extends Inference> WorkflowResponse<DocT> executeWorkflowPost(

private <ResponseT extends ApiResponse> MindeeHttpException getHttpError(
JavaType parametricType,
CloseableHttpResponse response
ClassicHttpResponse response
) {
int statusCode = response.getStatusLine().getStatusCode();
int statusCode = response.getCode();
String message = "HTTP Status " + statusCode + " - ";
String details;
String errorCode;
Expand Down Expand Up @@ -392,7 +396,7 @@ private HttpEntity buildHttpBody(
) throws JsonProcessingException {
if (requestParameters.getFile() != null) {
MultipartEntityBuilder builder = MultipartEntityBuilder.create();
builder.setMode(HttpMultipartMode.BROWSER_COMPATIBLE);
builder.setMode(HttpMultipartMode.EXTENDED);
builder.addBinaryBody(
"document",
requestParameters.getFile(),
Expand Down
Loading
Loading