[java] fix "Don't serialize binary stream - it might be large" when using RemoteWebDriver.builder()

java/src/org/openqa/selenium/remote/http/DumpHttpExchangeFilter.java

@@ -52,7 +52,7 @@ private void expandHeadersAndContent(StringBuilder builder, HttpMessage<?> messa
     message.forEachHeader(
         (name, value) -> builder.append("  ").append(name).append(": ").append(value).append("\n"));
     builder.append("\n");
-    builder.append(Contents.string(message));
+    builder.append(message);
   }
 
   /** visible for testing only */

java/test/org/openqa/selenium/grid/router/RemoteWebDriverDownloadTest.java

@@ -38,9 +38,9 @@
 import java.util.stream.Stream;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.EnumSource;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.openqa.selenium.By;
 import org.openqa.selenium.Capabilities;
@@ -65,6 +65,11 @@
 @Ignore(value = SAFARI, reason = "browser must support setting download location")
 class RemoteWebDriverDownloadTest extends JupiterTestBase {
 
+  enum DriverCreationMode {
+    CONSTRUCTOR,
+    BUILDER
+  }
+
   private static final Set<String> FILE_EXTENSIONS = Set.of(".txt", ".jpg");
 
   private Server<?> server;
@@ -97,10 +102,11 @@ public void tearDownGrid() {
     tearDowns.parallelStream().forEach(Safely::safelyCall);
   }
 
-  @Test
+  @ParameterizedTest
+  @EnumSource(DriverCreationMode.class)
   @NoDriverBeforeTest
-  void canListDownloadedFiles() {
-    localDriver = createWebdriver(capabilities);
+  void canListDownloadedFiles(DriverCreationMode mode) {
+    localDriver = createWebdriver(capabilities, mode);
 
     localDriver.get(appServer.whereIs("downloads/download.html"));
     localDriver.findElement(By.id("file-1")).click();
@@ -121,9 +127,10 @@ void canListDownloadedFiles() {
   @ParameterizedTest
   @MethodSource("downloadableFiles")
   @NoDriverBeforeTest
-  void canDownloadFiles(By selector, String expectedFileName, String expectedFileContent)
+  void canDownloadFiles(
+      DriverCreationMode mode, By selector, String expectedFileName, String expectedFileContent)
       throws IOException {
-    localDriver = createWebdriver(capabilities);
+    localDriver = createWebdriver(capabilities, mode);
 
     localDriver.get(appServer.whereIs("downloads/download.html"));
     localDriver.findElement(selector).click();
@@ -142,16 +149,23 @@ void canDownloadFiles(By selector, String expectedFileName, String expectedFileC
   }
 
   static Stream<Arguments> downloadableFiles() {
-    return Stream.of(
-        Arguments.of(By.id("file-1"), "file_1.txt", "Hello, World!"),
-        Arguments.of(
-            By.id("file-3"), "file-with-space 0 & _ ' ~.txt", "Hello, filename with space!"));
+    return Stream.of(DriverCreationMode.values())
+        .flatMap(
+            mode ->
+                Stream.of(
+                    Arguments.of(mode, By.id("file-1"), "file_1.txt", "Hello, World!"),
+                    Arguments.of(
+                        mode,
+                        By.id("file-3"),
+                        "file-with-space 0 & _ ' ~.txt",
+                        "Hello, filename with space!")));
   }
 
-  @Test
+  @ParameterizedTest
+  @EnumSource(DriverCreationMode.class)
   @NoDriverBeforeTest
-  void testCanDeleteFiles() {
-    localDriver = createWebdriver(capabilities);
+  void testCanDeleteFiles(DriverCreationMode mode) {
+    localDriver = createWebdriver(capabilities, mode);
     localDriver.get(appServer.whereIs("downloads/download.html"));
     localDriver.findElement(By.id("file-1")).click();
     waitForDownloadedFiles(localDriver, 1);
@@ -162,16 +176,17 @@ void testCanDeleteFiles() {
     assertThat(afterDeleteNames).isEmpty();
   }
 
-  @Test
+  @ParameterizedTest
+  @EnumSource(DriverCreationMode.class)
   @NoDriverBeforeTest
-  void errorsWhenCapabilityMissing() {
+  void errorsWhenCapabilityMissing(DriverCreationMode mode) {
     Browser browser = Browser.detect();
 
     Capabilities caps =
         new PersistentCapabilities(Objects.requireNonNull(browser).getCapabilities())
             .setCapability(ENABLE_DOWNLOADS, false);
 
-    localDriver = createWebdriver(caps);
+    localDriver = createWebdriver(caps, mode);
     assertThatThrownBy(() -> ((HasDownloads) localDriver).getDownloadedFiles())
         .isInstanceOf(WebDriverException.class)
         .hasMessageStartingWith(
@@ -184,8 +199,15 @@ void errorsWhenCapabilityMissing() {
             "You must enable downloads in order to work with downloadable files");
   }
 
-  private WebDriver createWebdriver(Capabilities capabilities) {
-    return new Augmenter().augment(new RemoteWebDriver(server.getUrl(), capabilities));
+  private WebDriver createWebdriver(Capabilities capabilities, DriverCreationMode mode) {
+    return switch (mode) {
+      case CONSTRUCTOR ->
+          new Augmenter().augment(new RemoteWebDriver(server.getUrl(), capabilities));
+      case BUILDER ->
+          new Augmenter()
+              .augment(
+                  RemoteWebDriver.builder().oneOf(capabilities).address(server.getUrl()).build());
+    };
   }
 
   /** ensure we hit no temporary file created by the browser while downloading */