Skip to content

Optimize HTTP client performance: eliminate redundant header... #1069

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
jenschude merged 1 commit into from
May 28, 2026
Merged

Optimize HTTP client performance: eliminate redundant header... #1069

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 9 additions & 14 deletions ...apachehttp-client/src/main/java/com/commercetools/http/apachehttp/CtApacheHttpClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,12 +188,9 @@ private AsyncRequestProducer toApacheRequest(final ApiHttpRequest httpRequest) {
if (httpRequest.getBody() != null) {
//default media type is JSON, if other media type is set as a header, use it
ContentType mediaType = ContentType.APPLICATION_JSON.withCharset(StandardCharsets.UTF_8);
if (httpRequest.getHeaders()
.getHeaders()
.stream()
.anyMatch(s -> s.getKey().equalsIgnoreCase(ApiHttpHeaders.CONTENT_TYPE))) {
mediaType = ContentType
.parse(Objects.requireNonNull(httpRequest.getHeaders().getFirst(ApiHttpHeaders.CONTENT_TYPE)));
final String contentTypeValue = httpRequest.getHeaders().getFirst(ApiHttpHeaders.CONTENT_TYPE);
if (contentTypeValue != null) {
mediaType = ContentType.parse(contentTypeValue);
}

builder.setEntity(httpRequest.getBody(), mediaType);
Expand All @@ -210,14 +207,12 @@ public CompletableFuture<ApiHttpResponse<byte[]>> execute(ApiHttpRequest request
}

private static ApiHttpResponse<byte[]> toResponse(final SimpleHttpResponse response) {
final Map<String, List<Header>> apacheHeaders = Arrays.stream(response.getHeaders())
.collect(Collectors.groupingBy(Header::getName));

final ApiHttpHeaders apiHttpHeaders = new ApiHttpHeaders(apacheHeaders.entrySet()
.stream()
.flatMap(
e -> e.getValue().stream().map(value -> ApiHttpHeaders.headerEntry(e.getKey(), value.getValue())))
.collect(Collectors.toList()));
final Header[] responseHeaders = response.getHeaders();
final List<Map.Entry<String, String>> headerList = new ArrayList<>(responseHeaders.length);
for (Header header : responseHeaders) {
headerList.add(ApiHttpHeaders.headerEntry(header.getName(), header.getValue()));
}
final ApiHttpHeaders apiHttpHeaders = new ApiHttpHeaders(headerList);

final byte[] bodyNullable = Optional.ofNullable(response.getBody()).map((SimpleBody entity) -> {
try {
Expand Down
9 changes: 3 additions & 6 deletions ...s-async-http-client/src/main/java/com/commercetools/http/asynchttp/CtAsyncHttpClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,12 +161,9 @@ private Request asAhcRequest(final ApiHttpRequest request) {
Optional.ofNullable(request.getBody()).ifPresent(body -> {
builder.setBody(body);
AsciiString mediaType = HttpHeaderValues.APPLICATION_JSON;
if (request.getHeaders()
.getHeaders()
.stream()
.anyMatch(s -> s.getKey().equalsIgnoreCase(ApiHttpHeaders.CONTENT_TYPE))) {
mediaType = AsciiString
.of(Objects.requireNonNull(request.getHeaders().getFirst(ApiHttpHeaders.CONTENT_TYPE)));
final String contentTypeValue = request.getHeaders().getFirst(ApiHttpHeaders.CONTENT_TYPE);
if (contentTypeValue != null) {
mediaType = AsciiString.of(contentTypeValue);
}
builder.setHeader(ApiHttpHeaders.CONTENT_TYPE, mediaType);
});
Expand Down
8 changes: 3 additions & 5 deletions ...ools-javanet-client/src/main/java/com/commercetools/http/javanet/CtJavaNetHttpClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,9 @@ private HttpRequest toJavaNetRequest(final ApiHttpRequest httpRequest) {

if (httpRequest.getBody() != null) {
String mediaType = APPLICATION_JSON;
if (httpRequest.getHeaders()
.getHeaders()
.stream()
.anyMatch(s -> s.getKey().equalsIgnoreCase(ApiHttpHeaders.CONTENT_TYPE))) {
mediaType = httpRequest.getHeaders().getFirst(ApiHttpHeaders.CONTENT_TYPE);
final String contentTypeValue = httpRequest.getHeaders().getFirst(ApiHttpHeaders.CONTENT_TYPE);
if (contentTypeValue != null) {
mediaType = contentTypeValue;
}
builder.setHeader(ApiHttpHeaders.CONTENT_TYPE, mediaType);

Expand Down
21 changes: 9 additions & 12 deletions ...rcetools-okhttp-client3/src/main/java/com/commercetools/http/okhttp3/CtOkHttp3Client.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,12 +108,12 @@ public CompletableFuture<ApiHttpResponse<byte[]>> execute(final ApiHttpRequest r
}

static ApiHttpResponse<byte[]> toResponse(final okhttp3.Response response) {
final ApiHttpHeaders apiHttpHeaders = new ApiHttpHeaders(response.headers()
.toMultimap()
.entrySet()
.stream()
.flatMap(e -> e.getValue().stream().map(value -> ApiHttpHeaders.headerEntry(e.getKey(), value)))
.collect(Collectors.toList()));
final okhttp3.Headers responseHeaders = response.headers();
final List<Map.Entry<String, String>> headerList = new ArrayList<>(responseHeaders.size());
for (int i = 0; i < responseHeaders.size(); i++) {
headerList.add(ApiHttpHeaders.headerEntry(responseHeaders.name(i), responseHeaders.value(i)));
}
final ApiHttpHeaders apiHttpHeaders = new ApiHttpHeaders(headerList);

final ApiHttpResponse<byte[]> apiHttpResponse = new ApiHttpResponse<>(response.code(), apiHttpHeaders,
Optional.ofNullable(response.body())
Expand Down Expand Up @@ -141,12 +141,9 @@ private static okhttp3.Request toRequest(final ApiHttpRequest apiHttpRequest) {

//default media type is JSON, if other media type is set as a header, use it
okhttp3.MediaType mediaType = JSON;
if (apiHttpRequest.getHeaders()
.getHeaders()
.stream()
.anyMatch(s -> s.getKey().equalsIgnoreCase(CONTENT_TYPE))) {
mediaType = okhttp3.MediaType
.parse(Objects.requireNonNull(apiHttpRequest.getHeaders().getFirst(ApiHttpHeaders.CONTENT_TYPE)));
final String contentTypeValue = apiHttpRequest.getHeaders().getFirst(ApiHttpHeaders.CONTENT_TYPE);
if (contentTypeValue != null) {
mediaType = okhttp3.MediaType.parse(contentTypeValue);
}

final okhttp3.RequestBody body = apiHttpRequest.getBody() == null ? null
Expand Down
21 changes: 9 additions & 12 deletions ...rcetools-okhttp-client4/src/main/java/com/commercetools/http/okhttp4/CtOkHttp4Client.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,12 +108,12 @@ public CompletableFuture<ApiHttpResponse<byte[]>> execute(final ApiHttpRequest r
}

static ApiHttpResponse<byte[]> toResponse(final okhttp3.Response response) {
final ApiHttpHeaders apiHttpHeaders = new ApiHttpHeaders(response.headers()
.toMultimap()
.entrySet()
.stream()
.flatMap(e -> e.getValue().stream().map(value -> ApiHttpHeaders.headerEntry(e.getKey(), value)))
.collect(Collectors.toList()));
final okhttp3.Headers responseHeaders = response.headers();
final List<Map.Entry<String, String>> headerList = new ArrayList<>(responseHeaders.size());
for (int i = 0; i < responseHeaders.size(); i++) {
headerList.add(ApiHttpHeaders.headerEntry(responseHeaders.name(i), responseHeaders.value(i)));
}
final ApiHttpHeaders apiHttpHeaders = new ApiHttpHeaders(headerList);

final ApiHttpResponse<byte[]> apiHttpResponse = new ApiHttpResponse<>(response.code(), apiHttpHeaders,
Optional.ofNullable(response.body())
Expand Down Expand Up @@ -141,12 +141,9 @@ private static okhttp3.Request toRequest(final ApiHttpRequest apiHttpRequest) {

//default media type is JSON, if other media type is set as a header, use it
okhttp3.MediaType mediaType = JSON;
if (apiHttpRequest.getHeaders()
.getHeaders()
.stream()
.anyMatch(s -> s.getKey().equalsIgnoreCase(CONTENT_TYPE))) {
mediaType = okhttp3.MediaType
.get(Objects.requireNonNull(apiHttpRequest.getHeaders().getFirst(ApiHttpHeaders.CONTENT_TYPE)));
final String contentTypeValue = apiHttpRequest.getHeaders().getFirst(ApiHttpHeaders.CONTENT_TYPE);
if (contentTypeValue != null) {
mediaType = okhttp3.MediaType.get(contentTypeValue);
}

try {
Expand Down
21 changes: 9 additions & 12 deletions ...rcetools-okhttp-client5/src/main/java/com/commercetools/http/okhttp5/CtOkHttp5Client.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,12 +108,12 @@ public CompletableFuture<ApiHttpResponse<byte[]>> execute(final ApiHttpRequest r
}

static ApiHttpResponse<byte[]> toResponse(final okhttp3.Response response) {
final ApiHttpHeaders apiHttpHeaders = new ApiHttpHeaders(response.headers()
.toMultimap()
.entrySet()
.stream()
.flatMap(e -> e.getValue().stream().map(value -> ApiHttpHeaders.headerEntry(e.getKey(), value)))
.collect(Collectors.toList()));
final okhttp3.Headers responseHeaders = response.headers();
final List<Map.Entry<String, String>> headerList = new ArrayList<>(responseHeaders.size());
for (int i = 0; i < responseHeaders.size(); i++) {
headerList.add(ApiHttpHeaders.headerEntry(responseHeaders.name(i), responseHeaders.value(i)));
}
final ApiHttpHeaders apiHttpHeaders = new ApiHttpHeaders(headerList);

final ApiHttpResponse<byte[]> apiHttpResponse = new ApiHttpResponse<>(response.code(), apiHttpHeaders,
Optional.ofNullable(response.body())
Expand Down Expand Up @@ -141,12 +141,9 @@ private static okhttp3.Request toRequest(final ApiHttpRequest apiHttpRequest) {

//default media type is JSON, if other media type is set as a header, use it
okhttp3.MediaType mediaType = JSON;
if (apiHttpRequest.getHeaders()
.getHeaders()
.stream()
.anyMatch(s -> s.getKey().equalsIgnoreCase(CONTENT_TYPE))) {
mediaType = okhttp3.MediaType
.get(Objects.requireNonNull(apiHttpRequest.getHeaders().getFirst(ApiHttpHeaders.CONTENT_TYPE)));
final String contentTypeValue = apiHttpRequest.getHeaders().getFirst(ApiHttpHeaders.CONTENT_TYPE);
if (contentTypeValue != null) {
mediaType = okhttp3.MediaType.get(contentTypeValue);
}

try {
Expand Down
9 changes: 3 additions & 6 deletions ...ols-reactornetty-client/src/main/java/com/commercetools/http/netty/CtNettyHttpClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,12 +144,9 @@ private static BiFunction<HttpClientRequest, NettyOutbound, Publisher<Void>> toN
});

AsciiString mediaType = HttpHeaderValues.APPLICATION_JSON;
if (httpRequest.getHeaders()
.getHeaders()
.stream()
.anyMatch(s -> s.getKey().equalsIgnoreCase(ApiHttpHeaders.CONTENT_TYPE))) {
mediaType = AsciiString
.of(Objects.requireNonNull(httpRequest.getHeaders().getFirst(ApiHttpHeaders.CONTENT_TYPE)));
final String contentTypeValue = httpRequest.getHeaders().getFirst(ApiHttpHeaders.CONTENT_TYPE);
if (contentTypeValue != null) {
mediaType = AsciiString.of(contentTypeValue);
}
nettyRequest.requestHeaders().set(ApiHttpHeaders.CONTENT_TYPE, mediaType);

Expand Down
9 changes: 5 additions & 4 deletions rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/oauth2/BaseAuthTokenSupplier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ public BaseAuthTokenSupplier(final VrapHttpClient vrapHttpClient, ApiHttpRequest
@Override
public CompletableFuture<AuthenticationToken> getToken() {
return vrapHttpClient.execute(apiHttpRequest).whenComplete((response, throwable) -> {
logger.info(() -> String.format("%s %s %s", apiHttpRequest.getMethod().name(), apiHttpRequest.getUri(),
response.getStatusCode()));
logger.info(() -> apiHttpRequest.getMethod().name() + " " + apiHttpRequest.getUri() + " "
+ response.getStatusCode());
if (throwable != null) {
logger.error(() -> response, throwable);
}
Expand All @@ -43,13 +43,14 @@ public CompletableFuture<AuthenticationToken> getToken() {
if (apiHttpResponse.getStatusCode() < 200 || apiHttpResponse.getStatusCode() > 299) {
if (apiHttpResponse.getStatusCode() == 405) {
throw new CompletionException(new AuthException(apiHttpResponse.getStatusCode(),
new String(apiHttpResponse.getBody()), apiHttpRequest.getHeaders(),
new String(apiHttpResponse.getBody(), StandardCharsets.UTF_8), apiHttpRequest.getHeaders(),
apiHttpResponse.getMessage()
+ " : auth token URI may be incorrect e.g. https://auth.europe-west1.gcp.commercetools.com/oauth/token",
apiHttpResponse));
}
throw new CompletionException(
new AuthException(apiHttpResponse.getStatusCode(), new String(apiHttpResponse.getBody()),
new AuthException(apiHttpResponse.getStatusCode(),
new String(apiHttpResponse.getBody(), StandardCharsets.UTF_8),
apiHttpRequest.getHeaders(), apiHttpResponse.getMessage(), apiHttpResponse));
}
return apiHttpResponse;
Expand Down
2 changes: 1 addition & 1 deletion rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/utils/CompletableFutureUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ public static <T> CompletableFuture<List<T>> listOfFuturesToFutureOfList(
final List<CompletableFuture<T>> futureList = list.stream()
.map(CompletionStage::toCompletableFuture)
.collect(toList());
final CompletableFuture[] futuresAsArray = futureList.toArray(new CompletableFuture[futureList.size()]);
final CompletableFuture[] futuresAsArray = futureList.toArray(new CompletableFuture[0]);
return CompletableFuture.allOf(futuresAsArray)
.thenApplyAsync(x -> futureList.stream().map(CompletableFuture::join).collect(Collectors.toList()));
}
Expand Down
Loading