chore: set version to 1.36.0 (#1336)

Fixes #1331

README.md

@@ -11,9 +11,9 @@ Playwright is a Java library to automate [Chromium](https://www.chromium.org/Hom
 
 |          | Linux | macOS | Windows |
 |   :---   | :---: | :---: | :---:   |
-| Chromium <!-- GEN:chromium-version -->115.0.5790.24<!-- GEN:stop --> | :white_check_mark: | :white_check_mark: | :white_check_mark: |
-| WebKit <!-- GEN:webkit-version -->16.4<!-- GEN:stop --> | ✅ | ✅ | ✅ |
-| Firefox <!-- GEN:firefox-version -->113.0<!-- GEN:stop --> | :white_check_mark: | :white_check_mark: | :white_check_mark: |
+| Chromium <!-- GEN:chromium-version -->115.0.5790.75<!-- GEN:stop --> | :white_check_mark: | :white_check_mark: | :white_check_mark: |
+| WebKit <!-- GEN:webkit-version -->17.0<!-- GEN:stop --> | ✅ | ✅ | ✅ |
+| Firefox <!-- GEN:firefox-version -->115.0<!-- GEN:stop --> | :white_check_mark: | :white_check_mark: | :white_check_mark: |
 
 Headless execution is supported for all the browsers on all platforms. Check out [system requirements](https://playwright.dev/java/docs/next/intro/#system-requirements) for details.
 

driver-bundle/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.microsoft.playwright</groupId>
     <artifactId>parent-pom</artifactId>
-    <version>1.35.0-SNAPSHOT</version>
+    <version>1.36.0</version>
   </parent>
 
   <artifactId>driver-bundle</artifactId>

driver/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.microsoft.playwright</groupId>
     <artifactId>parent-pom</artifactId>
-    <version>1.35.0-SNAPSHOT</version>
+    <version>1.36.0</version>
   </parent>
 
   <artifactId>driver</artifactId>

examples/pom.xml

@@ -6,7 +6,7 @@
 
   <groupId>org.example</groupId>
   <artifactId>examples</artifactId>
-  <version>1.35.0-SNAPSHOT</version>
+  <version>1.36.0</version>
   <name>Playwright Client Examples</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

playwright/pom.xml

@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.microsoft.playwright</groupId>
     <artifactId>parent-pom</artifactId>
-    <version>1.35.0-SNAPSHOT</version>
+    <version>1.36.0</version>
   </parent>
 
   <artifactId>playwright</artifactId>

playwright/src/main/java/com/microsoft/playwright/JSHandle.java

@@ -135,7 +135,7 @@ public interface JSHandle {
    *
    * <p> **Usage**
    * <pre>{@code
-   * JSHandle handle = page.evaluateHandle("() => ({window, document})");
+   * JSHandle handle = page.evaluateHandle("() => ({ window, document })");
    * Map<String, JSHandle> properties = handle.getProperties();
    * JSHandle windowHandle = properties.get("window");
    * JSHandle documentHandle = properties.get("document");

playwright/src/main/java/com/microsoft/playwright/impl/BrowserContextImpl.java

@@ -445,6 +445,10 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
 
   @Override
   public void setDefaultNavigationTimeout(double timeout) {
+    setDefaultNavigationTimeoutImpl(timeout);
+  }
+
+  void setDefaultNavigationTimeoutImpl(Double timeout) {
     withLogging("BrowserContext.setDefaultNavigationTimeout", () -> {
       timeoutSettings.setDefaultNavigationTimeout(timeout);
       JsonObject params = new JsonObject();
@@ -455,6 +459,10 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
 
   @Override
   public void setDefaultTimeout(double timeout) {
+    setDefaultTimeoutImpl(timeout);
+  }
+
+  void setDefaultTimeoutImpl(Double timeout) {
     withLogging("BrowserContext.setDefaultTimeout", () -> {
       timeoutSettings.setDefaultTimeout(timeout);
       JsonObject params = new JsonObject();

playwright/src/main/java/com/microsoft/playwright/impl/PageImpl.java

@@ -938,13 +938,13 @@ public class PageImpl extends ChannelOwner implements Page {
     withLogging("Page.pause", () -> {
       Double defaultNavigationTimeout = browserContext.timeoutSettings.defaultNavigationTimeout();
       Double defaultTimeout = browserContext.timeoutSettings.defaultTimeout();
-      browserContext.setDefaultNavigationTimeout(0);
-      browserContext.setDefaultTimeout(0);
+      browserContext.setDefaultNavigationTimeoutImpl(0.0);
+      browserContext.setDefaultTimeoutImpl(0.0);
       try {
         runUntil(() -> {}, new WaitableRace<>(asList(context().pause(), (Waitable<JsonElement>) waitableClosedOrCrashed)));
       } finally {
-        browserContext.setDefaultNavigationTimeout(defaultNavigationTimeout);
-        browserContext.setDefaultTimeout(defaultTimeout);
+        browserContext.setDefaultNavigationTimeoutImpl(defaultNavigationTimeout);
+        browserContext.setDefaultTimeoutImpl(defaultTimeout);
       }
     });
   }

playwright/src/main/java/com/microsoft/playwright/impl/Protocol.java

@@ -32,6 +32,7 @@ class SerializedValue{
   String v;
   String d;
   String u;
+  String bi;
   public static class R {
     String p;
     String f;

playwright/src/main/java/com/microsoft/playwright/impl/Serialization.java

@@ -28,6 +28,7 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.lang.reflect.Type;
+import java.math.BigInteger;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
@@ -162,6 +163,8 @@ class Serialization {
         result.d = ((LocalDateTime)value).atZone(ZoneId.systemDefault()).toInstant().toString();
       } else if (value instanceof URL) {
         result.u = ((URL)value).toString();
+      } else if (value instanceof BigInteger) {
+        result.bi = ((BigInteger)value).toString();
       } else if (value instanceof Pattern) {
         result.r = new SerializedValue.R();
         result.r.p = ((Pattern)value).pattern();
@@ -236,6 +239,9 @@ class Serialization {
         throw new PlaywrightException("Unexpected value: " + value.u, e);
       }
     }
+    if (value.bi != null) {
+      return (T) new BigInteger(value.bi);
+    }
     if (value.d != null)
       return (T)(Date.from(Instant.parse(value.d)));
     if (value.r != null)
@@ -330,6 +336,11 @@ class Serialization {
   }
 
   static JsonArray toProtocol(Map<String, String> map) {
+    for (String value : map.values()) {
+      if (value == null) {
+        throw new PlaywrightException("Value cannot be null");
+      }
+    }
     return toNameValueArray(map);
   }
 
@@ -348,7 +359,11 @@ class Serialization {
     for (Map.Entry<String, ?> e : map.entrySet()) {
       JsonObject item = new JsonObject();
       item.addProperty("name", e.getKey());
-      item.add("value", gson().toJsonTree(e.getValue()));
+      if (e.getValue() instanceof FilePayload) {
+        item.add("value", gson().toJsonTree(e.getValue()));
+      } else {
+        item.addProperty("value", "" + e.getValue());
+      }
       array.add(item);
     }
     return array;

playwright/src/main/java/com/microsoft/playwright/impl/TimeoutSettings.java

@@ -37,11 +37,11 @@ class TimeoutSettings {
     return defaultNavigationTimeout;
   }
 
-  void setDefaultTimeout(double timeout) {
+  void setDefaultTimeout(Double timeout) {
     defaultTimeout = timeout;
   }
 
-  void setDefaultNavigationTimeout(double timeout) {
+  void setDefaultNavigationTimeout(Double timeout) {
     defaultNavigationTimeout = timeout;
   }
 

playwright/src/main/java/com/microsoft/playwright/impl/Utils.java

@@ -89,7 +89,8 @@ class Utils {
   }
 
 
-  static Set<Character> escapeGlobChars = new HashSet<>(Arrays.asList('/', '$', '^', '+', '.', '(', ')', '=', '!', '|'));
+  // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_expressions#escaping
+  static Set<Character> escapeGlobChars = new HashSet<>(Arrays.asList('$', '^', '+', '.', '*', '(', ')', '|', '\\', '?', '{', '}', '[', ']'));
 
   static String globToRegex(String glob) {
     StringBuilder tokens = new StringBuilder();
@@ -97,8 +98,12 @@ class Utils {
     boolean inGroup = false;
     for (int i = 0; i < glob.length(); ++i) {
       char c = glob.charAt(i);
-      if (escapeGlobChars.contains(c)) {
-        tokens.append("\\").append(c);
+      if (c == '\\' && i + 1 < glob.length()) {
+        char nextChar = glob.charAt(++i);
+        if (escapeGlobChars.contains(nextChar)) {
+          tokens.append('\\');
+        }
+        tokens.append(nextChar);
         continue;
       }
       if (c == '*') {
@@ -139,7 +144,11 @@ class Utils {
           tokens.append("\\").append(c);
           break;
         default:
+          if (escapeGlobChars.contains(c)) {
+            tokens.append('\\');
+          }
           tokens.append(c);
+          break;
       }
     }
     tokens.append('$');

playwright/src/test/java/com/microsoft/playwright/TestBrowserContextFetch.java

@@ -511,14 +511,18 @@ public class TestBrowserContextFetch extends TestBase {
       FormData.create()
         .set("firstName", "John")
         .set("lastName", "Doe")
+        .set("age", 30)
+        .set("isMale", true)
         .set("file", "f.js")));
 
     assertEquals("POST", req.get().method);
     assertEquals(asList("application/x-www-form-urlencoded"), req.get().headers.get("content-type"));
     String body = new String(req.get().postBody);
-    assertTrue(body.contains("firstName=John"));
-    assertTrue(body.contains("lastName=Doe"));
-    assertTrue(body.contains("file=f.js"));
+    assertTrue(body.contains("firstName=John"), body);
+    assertTrue(body.contains("lastName=Doe"), body);
+    assertTrue(body.contains("age=30"), body);
+    assertTrue(body.contains("isMale=true"), body);
+    assertTrue(body.contains("file=f.js"), body);
   }
 
   @Test
@@ -526,6 +530,8 @@ public class TestBrowserContextFetch extends TestBase {
     Map<String, Object> data = mapOf(
       "firstName", "John",
       "lastName", "Doe",
+      "age", 30,
+      "isMale", true,
       "file", mapOf("name", "f.js")
     );
     Future<Server.Request> req = server.futureRequest("/empty.html");

playwright/src/test/java/com/microsoft/playwright/TestPageEvaluate.java

@@ -19,6 +19,7 @@ package com.microsoft.playwright;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.DisabledIf;
 
+import java.math.BigInteger;
 import java.time.*;
 import java.util.Map;
 import java.util.regex.Pattern;
@@ -115,6 +116,12 @@ public class TestPageEvaluate extends TestBase {
     assertEquals(true, result);
   }
 
+  @Test
+  void shouldTransferBigint() {
+    assertEquals(new BigInteger("42", 10), page.evaluate("() => 42n"));
+    assertEquals(new BigInteger("17", 10), page.evaluate("a => a", new BigInteger("17", 10)));
+  }
+
   //  @Test
   void shouldTransferMapsAsEmptyObjects() {
     // Not applicable.

playwright/src/test/java/com/microsoft/playwright/TestPageRoute.java

@@ -97,6 +97,42 @@ public class TestPageRoute extends TestBase {
     assertEquals(asList(1), intercepted);
   }
 
+  @Test
+  void shouldSupportQuestionMarkInGlobPattern() {
+    server.setRoute("/index", exchange -> {
+      exchange.sendResponseHeaders(200, 0);
+      try (OutputStreamWriter writer = new OutputStreamWriter(exchange.getResponseBody())) {
+        writer.write("index-no-hello");
+      }
+    });
+    server.setRoute("/index123hello", exchange -> {
+      exchange.sendResponseHeaders(200, 0);
+      try (OutputStreamWriter writer = new OutputStreamWriter(exchange.getResponseBody())) {
+        writer.write("index123hello");
+      }
+    });
+
+    page.route("**/index?hello", route -> {
+      route.fulfill(new Route.FulfillOptions().setBody("intercepted any character"));
+    });
+
+    page.route("**/index\\?hello", route -> {
+      route.fulfill(new Route.FulfillOptions().setBody("intercepted question mark"));
+    });
+
+    page.navigate(server.PREFIX + "/index?hello");
+    assertTrue(page.content().contains("intercepted question mark"), page.content());
+
+    page.navigate(server.PREFIX + "/index");
+    assertTrue(page.content().contains("index-no-hello"), page.content());
+
+    page.navigate(server.PREFIX + "/index1hello");
+    assertTrue(page.content().contains("intercepted any character"), page.content());
+
+    page.navigate(server.PREFIX + "/index123hello");
+    assertTrue(page.content().contains("index123hello"), page.content());
+  }
+
   @Test
   void shouldUnroutePredicate() {
     List<Integer> intercepted = new ArrayList<>();

playwright/src/test/java/com/microsoft/playwright/TestPageSetExtraHttpHeaders.java

@@ -73,6 +73,6 @@ public class TestPageSetExtraHttpHeaders extends TestBase {
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
       browser.newContext(new Browser.NewContextOptions().setExtraHTTPHeaders(mapOf("foo", null)));
     });
-    assertTrue(e.getMessage().contains("expected string, got undefined"));
+    assertTrue(e.getMessage().contains("Value cannot be null"));
   }
 }

pom.xml

@@ -6,7 +6,7 @@
 
   <groupId>com.microsoft.playwright</groupId>
   <artifactId>parent-pom</artifactId>
-  <version>1.35.0-SNAPSHOT</version>
+  <version>1.36.0</version>
   <packaging>pom</packaging>
   <name>Playwright Parent Project</name>
   <description>Java library to automate Chromium, Firefox and WebKit with a single API.

scripts/CLI_VERSION

@@ -1 +1 @@
-1.35.0
+1.36.1

tools/api-generator/pom.xml

@@ -6,7 +6,7 @@
 
   <groupId>com.microsoft.playwright</groupId>
   <artifactId>api-generator</artifactId>
-  <version>1.35.0-SNAPSHOT</version>
+  <version>1.36.0</version>
   <name>Playwright - API Generator</name>
   <description>
     This is an internal module used to generate Java API from the upstream Playwright

tools/test-cli-fatjar/pom.xml

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.microsoft.playwright</groupId>
   <artifactId>test-cli-fatjar</artifactId>
-  <version>1.35.0-SNAPSHOT</version>
+  <version>1.36.0</version>
   <name>Test Playwright Command Line FatJar</name>
   <properties>
     <compiler.version>1.8</compiler.version>

tools/test-cli-version/pom.xml

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.microsoft.playwright</groupId>
   <artifactId>test-cli-version</artifactId>
-  <version>1.35.0-SNAPSHOT</version>
+  <version>1.36.0</version>
   <name>Test Playwright Command Line Version</name>
   <properties>
     <compiler.version>1.8</compiler.version>

tools/test-local-installation/pom.xml

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.microsoft.playwright</groupId>
   <artifactId>test-local-installation</artifactId>
-  <version>1.35.0-SNAPSHOT</version>
+  <version>1.36.0</version>
   <name>Test local installation</name>
   <description>Runs Playwright test suite (copied from playwright module) against locally cached Playwright</description>
   <properties>

tools/test-spring-boot-starter/pom.xml

@@ -9,7 +9,7 @@
   </parent>
   <groupId>com.microsoft.playwright</groupId>
   <artifactId>test-spring-boot-starter</artifactId>
-  <version>1.35.0-SNAPSHOT</version>
+  <version>1.36.0</version>
   <name>Test Playwright With Spring Boot</name>
   <properties>
     <spring.version>2.4.3</spring.version>

tools/update-docs-version/pom.xml

@@ -6,7 +6,7 @@
 
   <groupId>com.microsoft.playwright</groupId>
   <artifactId>update-version</artifactId>
-  <version>1.35.0-SNAPSHOT</version>
+  <version>1.36.0</version>
   <name>Playwright - Update Version in Documentation</name>
   <description>
     This is an internal module used to update versions in the documentation based on