@@ -33,6 +33,7 @@

import org.openqa.selenium.remote.http.TextMessage;

import org.openqa.selenium.remote.http.WebSocket;

import java.io.ByteArrayInputStream;

import java.io.IOException;

import java.io.InputStream;

import java.io.UncheckedIOException;

@@ -230,9 +231,9 @@ private URI getWebSocketUri(HttpRequest request) {

@Override

public HttpResponse execute(HttpRequest req) throws UncheckedIOException {

Objects.requireNonNull(req, "Request");

BodyHandler<InputStream> streamHandler = BodyHandlers.ofInputStream();

BodyHandler<byte[]> byteHandler = BodyHandlers.ofByteArray();

try {

return messages.createResponse(client.send(messages.createRequest(req), streamHandler));

return messages.createResponse(client.send(messages.createRequest(req), byteHandler));

} catch (HttpTimeoutException e) {

throw new TimeoutException(e);

} catch (IOException e) {

@@ -23,6 +23,7 @@

import org.openqa.selenium.remote.http.HttpRequest;

import org.openqa.selenium.remote.http.HttpResponse;

import java.io.ByteArrayInputStream;

import java.io.InputStream;

import java.net.URI;

import java.net.URLEncoder;

@@ -118,12 +119,12 @@ public URI getRawUri(HttpRequest req) {

return URI.create(rawUrl);

}

public HttpResponse createResponse(java.net.http.HttpResponse<InputStream> response) {

public HttpResponse createResponse(java.net.http.HttpResponse<byte[]> response) {

HttpResponse res = new HttpResponse();

res.setStatus(response.statusCode());

response.headers().map()

.forEach((name, values) -> values.stream().filter(Objects::nonNull).forEach(value -> res.addHeader(name, value)));

res.setContent(response::body);

res.setContent(() -> new ByteArrayInputStream(response.body()));

return res;

}