chore: roll driver to 1.17.0-rc1 (#710)

Since Nov 16, 2021, we have the following conventions:

- Drivers published from tip-of-tree have an `-alpha` version and are
  stored at `/next` subfolder on Azure Storage.
- Drivers auto-published for each commit of the release branch have a `-beta` version and are
  stored at `/next` subfolder on Azure Storage.
- Drivers published due to a release might have `-rc` as part of the
  version, and are stored in root subfolder on Azure Storage.

We no longer have driver versions that include "next" as part of the
version. I kept it for backwards compatibility.

.azure-pipelines/publish.yml

@@ -1,60 +0,0 @@
-trigger:
-  none
-  
-# don't trigger for Pull Requests
-pr: none
-
-pool:
-  vmImage: ubuntu-22.04
-
-steps:
-- bash: |
-    if [[ ! "$CURRENT_BRANCH" =~ ^release-.* ]]; then
-      echo "Can only publish from a release branch."
-      echo "Unexpected branch name: $CURRENT_BRANCH"
-      exit 1
-    fi
-  env:
-    CURRENT_BRANCH: ${{ variables['Build.SourceBranchName'] }}
-  displayName: "Check the branch is a release branch"
-
-- bash: |
-    echo "importing GPG key:"
-    # Pipeline variables do not preserve line ends so we use base64 instead of --armored as a workaround.
-    echo $GPG_PRIVATE_KEY_BASE64 | base64 -d | gpg --batch --import
-    echo "list keys after import:"
-    gpg --list-keys
-  env:
-   GPG_PRIVATE_KEY_BASE64: $(GPG_PRIVATE_KEY_BASE64) # secret variable has to be mapped to an env variable
-  displayName: "Import gpg key"
-
-- bash: ./scripts/download_driver_for_all_platforms.sh
-  displayName: 'Download driver'
-
-- bash: mvn -B deploy -D skipTests --no-transfer-progress --activate-profiles release -D gpg.passphrase=$GPG_PASSPHRASE -DaltDeploymentRepository=snapshot-repo::default::file:$(pwd)/local-build
-  displayName: 'Build and deploy to a local directory'
-  env:
-    GPG_PASSPHRASE: $(GPG_PASSPHRASE) # secret variable has to be mapped to an env variable
-
-- bash: |
-    for file in $(find snapshots -type f); do
-      echo "processing: $file"
-      if [[ $file =~ \.(md5|sha1|sha256)$ ]]; then
-        continue
-      fi
-      sha256sum "$file" | cut -f1 -d \ > "$file.sha256"
-    done
-  displayName: 'Create .sha256 files'
-
-- task: EsrpRelease@2
-  inputs:
-    ConnectedServiceName: 'Playwright-Java-ESRP'
-    Intent: 'PackageDistribution'
-    ContentType: 'Maven'
-    PackageLocation: './local-build'
-    Owners: 'yurys@microsoft.com'
-    Approvers: 'maxschmitt@microsoft.com'
-    ServiceEndpointUrl: 'https://api.esrp.microsoft.com'
-    MainPublisher: 'PlaywrightJava'
-    DomainTenantId: '72f988bf-86f1-41af-91ab-2d7cd011db47'
-  displayName: 'ESRP Release to Maven'

.gitattributes

@@ -1,5 +1,3 @@
 # text files must be lf for golden file tests to work
-* text=auto eol=lf
-
-# make project show as TS on GitHub
-*.js linguist-detectable=false
+*.txt eol=lf
+*.json eol=lf

.github/ISSUE_TEMPLATE/bug.md

@@ -7,34 +7,19 @@ assignees: ''
 
 ---
 
-<!-- ⚠️⚠️ Do not delete this template ⚠️⚠️ -->
+**Context:**
+- Playwright Version: [what Playwright version do you use?]
+- Operating System: [e.g. Windows, Linux or Mac]
+- Browser: [e.g. All, Chromium, Firefox, WebKit]
+- Extra: [any specific details about your environment]
 
-<!-- 🔎 Search existing issues to avoid creating duplicates. -->
-<!-- 🧪 Test using the latest Playwright release to see if your issue has already been fixed -->
-<!-- 💡 Provide enough information for us to be able to reproduce your issue locally -->
+<!-- CLI to auto-capture this info -->
+<!-- npx envinfo --preset playwright --markdown -->
 
-### System info
-- Playwright Version: [v1.XX]
-- Operating System: [All, Windows 11, Ubuntu 20, macOS 13.2, etc.]
-- Browser: [All, Chromium, Firefox, WebKit]
-- Other info:
+**Code Snippet**
 
-### Source code
-
-- [ ] I provided exact source code that allows reproducing the issue locally.
-
-<!-- For simple cases, please provide a self-contained test file along with the config file -->
-<!-- For larger cases, you can provide a GitHub repo you created for this issue -->
-<!-- If we can not reproduce the problem locally, we won't be able to act on it -->
-<!-- You can still file without the exact code and we will try to help, but if we can't repro, it will be closed -->
-
-**Link to the GitHub repository with the repro**
-
-[https://github.com/your_profile/playwright_issue_title]
-
-or
-
-**Test file (self-contained)**
+Help us help you! Put down a short code snippet that illustrates your bug and
+that we can run and debug locally. For example:
 
 ```java
 import com.microsoft.playwright.*;
@@ -51,14 +36,6 @@ public class ExampleReproducible {
 }
 ```
 
-**Steps**
-- [Run the test]
-- [...]
+**Describe the bug**
 
-**Expected**
-
-[Describe expected behavior]
-
-**Actual**
-
-[Describe actual behavior]
+Add any other details about the problem here.

.github/ISSUE_TEMPLATE/config.yml

@@ -1,4 +1,4 @@
 contact_links:
-  - name: Join our Discord Server
-    url: https://aka.ms/playwright/discord
-    about: Ask questions and discuss with other community members
+  - name: Join our Slack community
+    url: https://aka.ms/playwright-slack
+    about: Ask questions and discuss with other community members

.github/ISSUE_TEMPLATE/question.md

@@ -0,0 +1,10 @@
+---
+name: I have a question
+about: Feel free to ask us your questions!
+title: "[Question]"
+labels: ''
+assignees: ''
+
+---
+
+

.github/workflows/publish.yml

@@ -0,0 +1,31 @@
+name: Publish
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+jobs:
+  build:
+    timeout-minutes: 30
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: microsoft/playwright-github-action@v1.5.0
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+          server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml
+          server-username: MAVEN_USERNAME # env variable for username in deploy
+          server-password: MAVEN_PASSWORD # env variable for token in deploy
+          gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
+          gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
+      - name: Download drivers
+        shell: bash
+        run: scripts/download_driver_for_all_platforms.sh
+      - name: Publish to Maven Central
+        run: mvn deploy --batch-mode -D skipTests --activate-profiles release --no-transfer-progress
+        env:
+          MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+          MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
+          MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}

.github/workflows/publish_canary_docker.yml

@@ -17,9 +17,10 @@ jobs:
         username: playwright
         password: ${{ secrets.DOCKER_PASSWORD }}
     - uses: actions/checkout@v2
-    - name: Set up Docker QEMU for arm64 docker builds
-      uses: docker/setup-qemu-action@v1
-      with:
-        platforms: arm64
-    - name: publish docker canary
-      run: ./utils/docker/publish_docker.sh canary
+    - name: Build Docker image
+      run: docker build -t playwright-java:localbuild-focal -f Dockerfile.focal .
+    - name: tag & publish
+      run: |
+        ./scripts/tag_image_and_push.sh playwright-java:localbuild-focal playwright.azurecr.io/public/playwright/java:next
+        ./scripts/tag_image_and_push.sh playwright-java:localbuild-focal playwright.azurecr.io/public/playwright/java:next-focal
+        ./scripts/tag_image_and_push.sh playwright-java:localbuild-focal playwright.azurecr.io/public/playwright/java:sha-${{ github.sha }}

.github/workflows/publish_docker_release.yml

@@ -3,11 +3,6 @@ on:
   release:
     types: [published]
   workflow_dispatch:
-    inputs:
-      is_release:
-        required: true
-        type: boolean
-        description: "Is this a release image?"
     branches:
       - release-*
 jobs:
@@ -22,12 +17,20 @@ jobs:
         login-server: playwright.azurecr.io
         username: playwright
         password: ${{ secrets.DOCKER_PASSWORD }}
-    - name: Set up Docker QEMU for arm64 docker builds
-      uses: docker/setup-qemu-action@v1
-      with:
-        platforms: arm64
     - uses: actions/checkout@v2
-    - run: ./utils/docker/publish_docker.sh stable
-      if: (github.event_name != 'workflow_dispatch' && !github.event.release.prerelease) || (github.event_name == 'workflow_dispatch' && github.event.inputs.is_release == 'true')
-    - run: ./utils/docker/publish_docker.sh canary
-      if: (github.event_name != 'workflow_dispatch' && github.event.release.prerelease) || (github.event_name == 'workflow_dispatch' && github.event.inputs.is_release != 'true')
+    - name: Build Docker image
+      run: docker build -t playwright-java:localbuild-focal -f Dockerfile.focal .
+    - name: tag & publish
+      run: |
+        # GITHUB_REF has a form of `refs/tags/v1.3.0`.
+        # TAG_NAME would be `v1.3.0`
+        TAG_NAME=${GITHUB_REF#refs/tags/}
+        if [[ ! "$TAG_NAME" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]];
+        then
+          echo "Wrong TAG_NAME format: $TAG_NAME"
+          exit 1
+        fi
+        ./scripts/tag_image_and_push.sh playwright-java:localbuild-focal playwright.azurecr.io/public/playwright/java:latest
+        ./scripts/tag_image_and_push.sh playwright-java:localbuild-focal playwright.azurecr.io/public/playwright/java:focal
+        ./scripts/tag_image_and_push.sh playwright-java:localbuild-focal playwright.azurecr.io/public/playwright/java:${TAG_NAME}
+        ./scripts/tag_image_and_push.sh playwright-java:localbuild-focal playwright.azurecr.io/public/playwright/java:${TAG_NAME}-focal

.github/workflows/test.yml

@@ -19,31 +19,32 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v2
-    - uses: microsoft/playwright-github-action@v1
+    - uses: microsoft/playwright-github-action@v1.5.0
     - name: Set up JDK 1.8
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v1
       with:
-        distribution: zulu
-        java-version: 8
+        java-version: 1.8
+    - name: Cache Maven packages
+      uses: actions/cache@v2
+      with:
+        path: ~/.m2
+        key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+        restore-keys: ${{ runner.os }}-m2
     - name: Download drivers
       shell: bash
       run: scripts/download_driver_for_all_platforms.sh
-    - name: Build & Install
-      run: mvn -B install -D skipTests --no-transfer-progress
+    - name: Build with Maven
+      run: mvn -B package -D skipTests --no-transfer-progress
     - name: Run tests
-      run: mvn test --no-transfer-progress --fail-at-end -D org.slf4j.simpleLogger.showDateTime=true -D org.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss
+      run: mvn test --no-transfer-progress --fail-at-end
       env:
         BROWSER: ${{ matrix.browser }}
-    - name: Run tracing tests w/ sources
-      run: mvn test --no-transfer-progress --fail-at-end -D test=*TestTracing* -D org.slf4j.simpleLogger.showDateTime=true -D org.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss
-      env:
-        BROWSER: ${{ matrix.browser }}
-        PLAYWRIGHT_JAVA_SRC: src/test/java
     - name: Test Spring Boot Starter
       shell: bash
       env:
         BROWSER: ${{ matrix.browser }}
       run: |
+        mvn -B install -D skipTests --no-transfer-progress
         cd tools/test-spring-boot-starter
         mvn package -D skipTests --no-transfer-progress
         java -jar target/test-spring-boot*.jar
@@ -63,56 +64,28 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
-      - uses: microsoft/playwright-github-action@v1
+      - uses: microsoft/playwright-github-action@v1.5.0
       - name: Install Media Pack
         if: matrix.os == 'windows-latest'
         shell: powershell
         run: Install-WindowsFeature Server-Media-Foundation
       - name: Set up JDK 1.8
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v1
         with:
-          distribution: zulu
-          java-version: 8
+          java-version: 1.8
+      - name: Cache Maven packages
+        uses: actions/cache@v2
+        with:
+          path: ~/.m2
+          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+          restore-keys: ${{ runner.os }}-m2
       - name: Download drivers
         shell: bash
         run: scripts/download_driver_for_all_platforms.sh
-      - name: Build & Install
-        run: mvn -B install -D skipTests --no-transfer-progress
-      - name: Run tests
-        run: mvn test --no-transfer-progress --fail-at-end -D org.slf4j.simpleLogger.showDateTime=true -D org.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss
-        env:
-          BROWSER: chromium
-          BROWSER_CHANNEL: ${{ matrix.browser-channel }}
-
-  Java_17:
-    timeout-minutes: 30
-    strategy:
-      fail-fast: false
-      matrix:
-        browser: [chromium, firefox, webkit]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: microsoft/playwright-github-action@v1
-      - name: Set up JDK 17
-        uses: actions/setup-java@v2
-        with:
-          distribution: adopt
-          java-version: 17
-      - name: Download drivers
-        shell: bash
-        run: scripts/download_driver_for_all_platforms.sh
-      - name: Build & Install
-        run: mvn -B install -D skipTests --no-transfer-progress
+      - name: Build with Maven
+        run: mvn -B package -D skipTests --no-transfer-progress
       - name: Run tests
         run: mvn test --no-transfer-progress --fail-at-end
         env:
-          BROWSER: ${{ matrix.browser }}
-      - name: Test Spring Boot Starter
-        shell: bash
-        env:
-          BROWSER: ${{ matrix.browser }}
-        run: |
-          cd tools/test-spring-boot-starter
-          mvn package -D skipTests --no-transfer-progress
-          java -jar target/test-spring-boot*.jar
+          BROWSER: chromium
+          BROWSER_CHANNEL: ${{ matrix.browser-channel }}

.github/workflows/test_cli.yml

@@ -26,9 +26,3 @@ jobs:
         run: mvn install -D skipTests --no-transfer-progress
       - name: Test CLI
         run: mvn exec:java -e -D exec.mainClass=com.microsoft.playwright.CLI -f playwright/pom.xml  -D exec.args=-V
-      - name: Test CLI version
-        shell: bash
-        run: tools/test-cli-version/test.sh
-      - name: Test CLI Fatjar
-        shell: bash
-        run: tools/test-cli-fatjar/test.sh

.github/workflows/test_docker.yml

@@ -1,16 +1,16 @@
-name: Docker
+name: Test Docker
 on:
   push:
     paths:
       - '.github/workflows/test_docker.yml'
-      - '**/Dockerfile*'
+      - 'Dockerfile*'
     branches:
       - main
       - release-*
   pull_request:
     paths:
       - .github/workflows/test_docker.yml
-      - '**/Dockerfile*'
+      - Dockerfile.*
       - scripts/CLI_VERSION
       - '**/pom.xml'
     branches:
@@ -18,18 +18,13 @@ on:
       - release-*
 jobs:
   test:
-    name: Test
-    timeout-minutes: 120
-    runs-on: ubuntu-22.04
-    strategy:
-      fail-fast: false
-      matrix:
-        flavor: [focal, jammy]
+    timeout-minutes: 60
+    runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
       - name: Build Docker image
-        run: bash utils/docker/build.sh --amd64 ${{ matrix.flavor }} playwright-java:localbuild-${{ matrix.flavor }}
+        run: docker build -t playwright-java:localbuild-focal -f Dockerfile.focal .
       - name: Test
         run: |
-          CONTAINER_ID="$(docker run --rm --ipc=host -v $(pwd):/root/playwright --name playwright-docker-test -d -t playwright-java:localbuild-${{ matrix.flavor }} /bin/bash)"
+          CONTAINER_ID="$(docker run --rm --ipc=host -v $(pwd):/root/playwright --name playwright-docker-test -d -t playwright-java:localbuild-focal /bin/bash)"
           docker exec "${CONTAINER_ID}" /root/playwright/tools/test-local-installation/create_project_and_run_tests.sh

.github/workflows/trigger_internal_tests.yml

@@ -1,21 +0,0 @@
-name: "Internal Tests"
-
-on:
-  push:
-    branches:
-      - main
-      - release-*
-
-jobs:
-  trigger:
-    name: "trigger"
-    runs-on: ubuntu-20.04
-    steps:
-    - run: |
-        curl -X POST \
-          -H "Accept: application/vnd.github.v3+json" \
-          -H "Authorization: token ${GH_TOKEN}" \
-          --data "{\"event_type\": \"playwright_tests_java\", \"client_payload\": {\"ref\": \"${GITHUB_SHA}\"}}" \
-          https://api.github.com/repos/microsoft/playwright-browsers/dispatches
-      env:
-        GH_TOKEN: ${{ secrets.REPOSITORY_DISPATCH_PERSONAL_ACCESS_TOKEN }}

.github/workflows/verify_api.yml

@@ -20,7 +20,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: microsoft/playwright-github-action@v1
+      - uses: microsoft/playwright-github-action@v1.5.0
+      - name: Cache Maven packages
+        uses: actions/cache@v2
+        with:
+          path: ~/.m2
+          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+          restore-keys: ${{ runner.os }}-m2
       - name: Download drivers
         run: scripts/download_driver_for_all_platforms.sh
       - name: Regenerate APIs

CONTRIBUTING.md

@@ -8,7 +8,7 @@ Install git, Java JDK (version >= 8), Maven (tested with version 3.6.3), on Ubun
 just run the following command:
 
 ```sh
-sudo apt-get install git openjdk-11-jdk maven unzip
+sudo apt-get install git openjdk-11-jdk maven
 ```
 
 ### Getting the Code
@@ -49,19 +49,6 @@ Java interfaces for the current driver run the following commands:
 ./scripts/generate_api.sh
 ```
 
-#### Updating driver version
-
-Driver version is read from [scripts/CLI_VERSION](https://github.com/microsoft/playwright-java/blob/main/scripts/CLI_VERSION) and can be found in the upstream [GHA build](https://github.com/microsoft/playwright/actions/workflows/publish_canary.yml) logs. To update the driver to a particular version run the following commands:
-
-```bash
-cat > scripts/CLI_VERSION
-<paste new version>
-^D
-./scripts/download_driver_for_all_platforms.sh -f
-./scripts/generate_api.sh
-./scripts/update_readme.sh
-```
-
 ### Code Style
 
 - We try to follow [Google Java Style Guide](https://google.github.io/styleguide/javaguide.html)

Dockerfile.focal

@@ -0,0 +1,32 @@
+FROM ubuntu:focal
+
+# === INSTALL JDK and Maven ===
+
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    openjdk-11-jdk maven
+
+ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
+
+# Install utilities required for downloading driver
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    curl unzip
+
+# === INSTALL playwright maven modules & browsers ===
+
+# Browsers will remain downloaded in `/ms-playwright`.
+# Note: make sure to set 777 to the registry so that any user can access
+# registry.
+ENV PLAYWRIGHT_BROWSERS_PATH=/ms-playwright
+
+RUN mkdir /ms-playwright && chmod -R 777 $PLAYWRIGHT_BROWSERS_PATH
+
+RUN mkdir /tmp/pw-java
+COPY . /tmp/pw-java
+RUN cd /tmp/pw-java && \
+    ./scripts/download_driver_for_all_platforms.sh && \
+    mvn install -D skipTests --no-transfer-progress && \
+    DEBIAN_FRONTEND=noninteractive mvn exec:java -e -D exec.mainClass=com.microsoft.playwright.CLI \
+                     -D exec.args="install-deps" -f playwright/pom.xml --no-transfer-progress && \
+    mvn exec:java -e -D exec.mainClass=com.microsoft.playwright.CLI \
+                     -D exec.args="install" -f playwright/pom.xml --no-transfer-progress && \
+    rm -rf /tmp/pw-java

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 -->98.0.4695.0<!-- GEN:stop --> | :white_check_mark: | :white_check_mark: | :white_check_mark: |
+| WebKit <!-- GEN:webkit-version -->15.4<!-- GEN:stop --> | ✅ | ✅ | ✅ |
+| Firefox <!-- GEN:firefox-version -->94.0.1<!-- 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.
 
@@ -43,18 +43,10 @@ To run Playwright simply add following dependency to your Maven project:
 <dependency>
   <groupId>com.microsoft.playwright</groupId>
   <artifactId>playwright</artifactId>
-  <version>1.28.1</version>
+  <version>1.16.0</version>
 </dependency>
 ```
 
-To run Playwright using Gradle add following dependency to your build.gradle file:
-
-```gradle
-dependencies {
-  implementation group: 'com.microsoft.playwright', name: 'playwright', version: '1.28.1'
-}
-```
-
 #### Is Playwright thread-safe?
 
 No, Playwright is not thread safe, i.e. all its methods as well as methods on all objects created by it (such as BrowserContext, Browser, Page etc.) are expected to be called on the same thread where Playwright object was created or proper synchronization should be implemented to ensure only one thread calls Playwright methods at any given time. Having said that it's okay to create multiple Playwright instances each on its own thread.
@@ -65,7 +57,7 @@ You can find Maven project with the examples [here](./examples).
 
 #### Page screenshot
 
-This code snippet navigates to Playwright homepage in Chromium, Firefox and WebKit, and saves 3 screenshots.
+This code snippet navigates to whatsmyuseragent.org in Chromium, Firefox and WebKit, and saves 3 screenshots.
 
 ```java
 import com.microsoft.playwright.*;
@@ -86,7 +78,7 @@ public class PageScreenshot {
         try (Browser browser = browserType.launch()) {
           BrowserContext context = browser.newContext();
           Page page = context.newPage();
-          page.navigate("https://playwright.dev/");
+          page.navigate("http://whatsmyuseragent.org/");
           page.screenshot(new Page.ScreenshotOptions().setPath(Paths.get("screenshot-" + browserType.name() + ".png")));
         }
       }
@@ -181,7 +173,7 @@ public class InterceptNetworkRequests {
 
 ## Documentation
 
-Check out our official [documentation site](https://playwright.dev/java).
+Check out our [new documentation site](https://playwright.dev/java)!.
 
 You can also browse [javadoc online](https://www.javadoc.io/doc/com.microsoft.playwright/playwright/latest/index.html).
 

assertions/pom.xml

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>com.microsoft.playwright</groupId>
+    <artifactId>parent-pom</artifactId>
+    <version>1.17.0</version>
+  </parent>
+
+  <artifactId>assertions</artifactId>
+  <name>Playwright - Assertions</name>
+  <description>
+    This module provides Playwright assertions that will wait until the expected condition is met.
+  </description>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <subpackages>com.microsoft.playwright.assertions</subpackages>
+          <excludePackageNames>com.microsoft.playwright.impl</excludePackageNames>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.opentest4j</groupId>
+      <artifactId>opentest4j</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.microsoft.playwright</groupId>
+      <artifactId>playwright</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.microsoft.playwright</groupId>
+      <artifactId>playwright</artifactId>
+      <version>${project.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+</project>

assertions/src/main/java/com/microsoft/playwright/assertions/PageAssertions.java

@@ -16,11 +16,14 @@
 
 package com.microsoft.playwright.assertions;
 
+import java.util.*;
 import java.util.regex.Pattern;
+import com.microsoft.playwright.Page;
 
 /**
- * The {@code PageAssertions} class provides assertion methods that can be used to make assertions about the {@code Page}
- * state in the tests.
+ * The {@code PageAssertions} class provides assertion methods that can be used to make assertions about the {@code Page} state in the
+ * tests. A new instance of {@code LocatorAssertions} is created by calling {@link PlaywrightAssertions#assertThat
+ * PlaywrightAssertions.assertThat()}:
  * <pre>{@code
  * ...
  * import static com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat;
@@ -30,7 +33,7 @@ import java.util.regex.Pattern;
  *   @Test
  *   void navigatesToLoginPage() {
  *     ...
- *     page.getByText("Sign in").click();
+ *     page.click("#login");
  *     assertThat(page).hasURL(Pattern.compile(".*\/login"));
  *   }
  * }
@@ -39,12 +42,12 @@ import java.util.regex.Pattern;
 public interface PageAssertions {
   class HasTitleOptions {
     /**
-     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
+     * Time to retry the assertion for.
      */
     public Double timeout;
 
     /**
-     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
+     * Time to retry the assertion for.
      */
     public HasTitleOptions setTimeout(double timeout) {
       this.timeout = timeout;
@@ -53,131 +56,105 @@ public interface PageAssertions {
   }
   class HasURLOptions {
     /**
-     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
+     * Time to retry the assertion for.
      */
     public Double timeout;
 
     /**
-     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
+     * Time to retry the assertion for.
      */
     public HasURLOptions setTimeout(double timeout) {
       this.timeout = timeout;
       return this;
     }
   }
-  /**
-   * Makes the assertion check for the opposite condition. For example, this code tests that the page URL doesn't contain
-   * {@code "error"}:
-   * <pre>{@code
-   * assertThat(page).not().hasURL("error");
-   * }</pre>
-   *
-   * @since v1.20
-   */
-  PageAssertions not();
   /**
    * Ensures the page has the given title.
-   *
-   * <p> **Usage**
    * <pre>{@code
    * assertThat(page).hasTitle("Playwright");
    * }</pre>
    *
    * @param titleOrRegExp Expected title or RegExp.
-   * @since v1.20
    */
   default void hasTitle(String titleOrRegExp) {
     hasTitle(titleOrRegExp, null);
   }
   /**
    * Ensures the page has the given title.
-   *
-   * <p> **Usage**
    * <pre>{@code
    * assertThat(page).hasTitle("Playwright");
    * }</pre>
    *
    * @param titleOrRegExp Expected title or RegExp.
-   * @since v1.20
    */
   void hasTitle(String titleOrRegExp, HasTitleOptions options);
   /**
    * Ensures the page has the given title.
-   *
-   * <p> **Usage**
    * <pre>{@code
    * assertThat(page).hasTitle("Playwright");
    * }</pre>
    *
    * @param titleOrRegExp Expected title or RegExp.
-   * @since v1.20
    */
   default void hasTitle(Pattern titleOrRegExp) {
     hasTitle(titleOrRegExp, null);
   }
   /**
    * Ensures the page has the given title.
-   *
-   * <p> **Usage**
    * <pre>{@code
    * assertThat(page).hasTitle("Playwright");
    * }</pre>
    *
    * @param titleOrRegExp Expected title or RegExp.
-   * @since v1.20
    */
   void hasTitle(Pattern titleOrRegExp, HasTitleOptions options);
   /**
    * Ensures the page is navigated to the given URL.
-   *
-   * <p> **Usage**
    * <pre>{@code
    * assertThat(page).hasURL(".com");
    * }</pre>
    *
-   * @param urlOrRegExp Expected URL string or RegExp.
-   * @since v1.20
+   * @param urlOrRegExp Expected substring or RegExp.
    */
   default void hasURL(String urlOrRegExp) {
     hasURL(urlOrRegExp, null);
   }
   /**
    * Ensures the page is navigated to the given URL.
-   *
-   * <p> **Usage**
    * <pre>{@code
    * assertThat(page).hasURL(".com");
    * }</pre>
    *
-   * @param urlOrRegExp Expected URL string or RegExp.
-   * @since v1.20
+   * @param urlOrRegExp Expected substring or RegExp.
    */
   void hasURL(String urlOrRegExp, HasURLOptions options);
   /**
    * Ensures the page is navigated to the given URL.
-   *
-   * <p> **Usage**
    * <pre>{@code
    * assertThat(page).hasURL(".com");
    * }</pre>
    *
-   * @param urlOrRegExp Expected URL string or RegExp.
-   * @since v1.20
+   * @param urlOrRegExp Expected substring or RegExp.
    */
   default void hasURL(Pattern urlOrRegExp) {
     hasURL(urlOrRegExp, null);
   }
   /**
    * Ensures the page is navigated to the given URL.
-   *
-   * <p> **Usage**
    * <pre>{@code
    * assertThat(page).hasURL(".com");
    * }</pre>
    *
-   * @param urlOrRegExp Expected URL string or RegExp.
-   * @since v1.20
+   * @param urlOrRegExp Expected substring or RegExp.
    */
   void hasURL(Pattern urlOrRegExp, HasURLOptions options);
+  /**
+   * Makes the assertion check for the opposite condition. For example, this code tests that the page URL doesn't contain
+   * {@code "error"}:
+   * <pre>{@code
+   * assertThat(page).not().hasURL("error");
+   * }</pre>
+   */
+  PageAssertions not();
 }
 

assertions/src/main/java/com/microsoft/playwright/assertions/PlaywrightAssertions.java

@@ -16,17 +16,15 @@
 
 package com.microsoft.playwright.assertions;
 
-import com.microsoft.playwright.APIResponse;
+import java.util.*;
 import com.microsoft.playwright.Locator;
 import com.microsoft.playwright.Page;
-import com.microsoft.playwright.impl.APIResponseAssertionsImpl;
-import com.microsoft.playwright.impl.AssertionsTimeout;
 import com.microsoft.playwright.impl.LocatorAssertionsImpl;
 import com.microsoft.playwright.impl.PageAssertionsImpl;
 
 /**
- * Playwright gives you Web-First Assertions with convenience methods for creating assertions that will wait and retry
- * until the expected condition is met.
+ * The {@code PlaywrightAssertions} class provides convenience methods for creating assertions that will wait until the expected
+ * condition is met.
  *
  * <p> Consider the following example:
  * <pre>{@code
@@ -38,44 +36,28 @@ import com.microsoft.playwright.impl.PageAssertionsImpl;
  *   @Test
  *   void statusBecomesSubmitted() {
  *     ...
- *     page.locator("#submit-button").click();
+ *     page.click("#submit-button");
  *     assertThat(page.locator(".status")).hasText("Submitted");
  *   }
  * }
  * }</pre>
  *
- * <p> Playwright will be re-testing the node with the selector {@code .status} until fetched Node has the {@code "Submitted"}
- * text. It will be re-fetching the node and checking it over and over, until the condition is met or until the timeout is
- * reached. You can pass this timeout as an option.
+ * <p> Playwright will be re-testing the node with the selector {@code .status} until fetched Node has the {@code "Submitted"} text. It
+ * will be re-fetching the node and checking it over and over, until the condition is met or until the timeout is reached.
+ * You can pass this timeout as an option.
  *
  * <p> By default, the timeout for assertions is set to 5 seconds.
+ *
+ * <p> To use Playwright assertions add the following dependency into the {@code pom.xml} of your Maven project:
  */
 public interface PlaywrightAssertions {
-  /**
-   * Creates a {@code APIResponseAssertions} object for the given {@code APIResponse}.
-   *
-   * <p> **Usage**
-   * <pre>{@code
-   * PlaywrightAssertions.assertThat(response).isOK();
-   * }</pre>
-   *
-   * @param response {@code APIResponse} object to use for assertions.
-   * @since v1.18
-   */
-  static APIResponseAssertions assertThat(APIResponse response) {
-    return new APIResponseAssertionsImpl(response);
-  }
-
   /**
    * Creates a {@code LocatorAssertions} object for the given {@code Locator}.
-   *
-   * <p> **Usage**
    * <pre>{@code
    * PlaywrightAssertions.assertThat(locator).isVisible();
    * }</pre>
    *
    * @param locator {@code Locator} object to use for assertions.
-   * @since v1.18
    */
   static LocatorAssertions assertThat(Locator locator) {
     return new LocatorAssertionsImpl(locator);
@@ -83,33 +65,15 @@ public interface PlaywrightAssertions {
 
   /**
    * Creates a {@code PageAssertions} object for the given {@code Page}.
-   *
-   * <p> **Usage**
    * <pre>{@code
    * PlaywrightAssertions.assertThat(page).hasTitle("News");
    * }</pre>
    *
    * @param page {@code Page} object to use for assertions.
-   * @since v1.18
    */
   static PageAssertions assertThat(Page page) {
     return new PageAssertionsImpl(page);
   }
 
-  /**
-   * Changes default timeout for Playwright assertions from 5 seconds to the specified value.
-   *
-   * <p> **Usage**
-   * <pre>{@code
-   * PlaywrightAssertions.setDefaultAssertionTimeout(30_000);
-   * }</pre>
-   *
-   * @param timeout Timeout in milliseconds.
-   * @since v1.25
-   */
-  static void setDefaultAssertionTimeout(double milliseconds) {
-    AssertionsTimeout.setDefaultTimeout(milliseconds);
-  }
-
 }
 

assertions/src/main/java/com/microsoft/playwright/impl/AssertionsBase.java

@@ -25,7 +25,6 @@ import java.util.List;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
-import static com.microsoft.playwright.impl.Utils.toJsRegexFlags;
 import static java.util.Arrays.asList;
 
 class AssertionsBase {
@@ -52,7 +51,7 @@ class AssertionsBase {
 
   void expectImpl(String expression, FrameExpectOptions expectOptions, Object expected, String message) {
     if (expectOptions.timeout == null) {
-      expectOptions.timeout = AssertionsTimeout.defaultTimeout;
+      expectOptions.timeout = 5_000.0;
     }
     if (expectOptions.isNot) {
       message = message.replace("expected to", "expected not to");
@@ -67,10 +66,7 @@ class AssertionsBase {
       if (expected == null) {
         throw new AssertionFailedError(message + log);
       }
-      ValueWrapper expectedValue = formatValue(expected);
-      ValueWrapper actualValue = formatValue(actual);
-      message += ": " + expectedValue.getStringRepresentation() + "\nReceived: " + actualValue.getStringRepresentation() + "\n";
-      throw new AssertionFailedError(message + log, expectedValue, actualValue);
+      throw new AssertionFailedError(message + log, formatValue(expected), formatValue(actual));
     }
   }
 
@@ -87,7 +83,22 @@ class AssertionsBase {
     ExpectedTextValue expected = new ExpectedTextValue();
     expected.regexSource = pattern.pattern();
     if (pattern.flags() != 0) {
-      expected.regexFlags = toJsRegexFlags(pattern);
+      expected.regexFlags = "";
+      if ((pattern.flags() & Pattern.CASE_INSENSITIVE) != 0) {
+        // Case-insensitive search.
+        expected.regexFlags += "i";
+      }
+      if ((pattern.flags() & Pattern.DOTALL) != 0) {
+        // Allows . to match newline characters.
+        expected.regexFlags += "s";
+      }
+      if ((pattern.flags() & Pattern.MULTILINE) != 0) {
+        // Multi-line search.
+        expected.regexFlags += "m";
+      }
+      if ((pattern.flags() & ~(Pattern.MULTILINE | Pattern.CASE_INSENSITIVE | Pattern.DOTALL)) != 0) {
+        throw new PlaywrightException("Unexpected RegEx flag, only CASE_INSENSITIVE, DOTALL and MULTILINE are supported.");
+      }
     }
     return expected;
   }

assertions/src/main/java/com/microsoft/playwright/impl/LocatorAssertionsImpl.java

@@ -19,13 +19,12 @@ package com.microsoft.playwright.impl;
 import com.microsoft.playwright.Locator;
 import com.microsoft.playwright.assertions.LocatorAssertions;
 
-import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Pattern;
 
 import static com.microsoft.playwright.impl.Serialization.serializeArgument;
-import static com.microsoft.playwright.impl.Utils.convertType;
+import static com.microsoft.playwright.impl.Utils.convertViaJson;
 
 public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAssertions {
   public LocatorAssertionsImpl(Locator locator) {
@@ -40,19 +39,17 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
   public void containsText(String text, ContainsTextOptions options) {
     ExpectedTextValue expected = new ExpectedTextValue();
     expected.string = text;
-    expected.ignoreCase = shouldIgnoreCase(options);
     expected.matchSubstring = true;
     expected.normalizeWhiteSpace = true;
-    expectImpl("to.have.text", expected, text, "Locator expected to contain text", convertType(options, FrameExpectOptions.class));
+    expectImpl("to.have.text", expected, text, "Locator expected to contain text", convertViaJson(options, FrameExpectOptions.class));
   }
 
   @Override
   public void containsText(Pattern pattern, ContainsTextOptions options) {
     ExpectedTextValue expected = expectedRegex(pattern);
-    expected.ignoreCase = shouldIgnoreCase(options);
     expected.matchSubstring = true;
     expected.normalizeWhiteSpace = true;
-    expectImpl("to.have.text", expected, pattern, "Locator expected to contain regex", convertType(options, FrameExpectOptions.class));
+    expectImpl("to.have.text", expected, pattern, "Locator expected to contain regex", convertViaJson(options, FrameExpectOptions.class));
   }
 
   @Override
@@ -61,12 +58,11 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
     for (String text : strings) {
       ExpectedTextValue expected = new ExpectedTextValue();
       expected.string = text;
-      expected.ignoreCase = shouldIgnoreCase(options);
       expected.matchSubstring = true;
       expected.normalizeWhiteSpace = true;
       list.add(expected);
     }
-    expectImpl("to.contain.text.array", list, strings, "Locator expected to contain text", convertType(options, FrameExpectOptions.class));
+    expectImpl("to.contain.text.array", list, strings, "Locator expected to contain text", convertViaJson(options, FrameExpectOptions.class));
   }
 
   @Override
@@ -74,12 +70,11 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
     List<ExpectedTextValue> list = new ArrayList<>();
     for (Pattern pattern : patterns) {
       ExpectedTextValue expected = expectedRegex(pattern);
-      expected.ignoreCase = shouldIgnoreCase(options);
       expected.matchSubstring = true;
       expected.normalizeWhiteSpace = true;
       list.add(expected);
     }
-    expectImpl("to.contain.text.array", list, patterns, "Locator expected to contain text", convertType(options, FrameExpectOptions.class));
+    expectImpl("to.contain.text.array", list, patterns, "Locator expected to contain text", convertViaJson(options, FrameExpectOptions.class));
   }
 
   @Override
@@ -99,7 +94,7 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
     if (options == null) {
       options = new HasAttributeOptions();
     }
-    FrameExpectOptions commonOptions = convertType(options, FrameExpectOptions.class);
+    FrameExpectOptions commonOptions = convertViaJson(options, FrameExpectOptions.class);
     commonOptions.expressionArg = name;
     String message = "Locator expected to have attribute '" + name + "'";
     if (expectedValue instanceof Pattern) {
@@ -112,13 +107,13 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
   public void hasClass(String text, HasClassOptions options) {
     ExpectedTextValue expected = new ExpectedTextValue();
     expected.string = text;
-    expectImpl("to.have.class", expected, text, "Locator expected to have class", convertType(options, FrameExpectOptions.class));
+    expectImpl("to.have.class", expected, text, "Locator expected to have class", convertViaJson(options, FrameExpectOptions.class));
   }
 
   @Override
   public void hasClass(Pattern pattern, HasClassOptions options) {
     ExpectedTextValue expected = expectedRegex(pattern);
-    expectImpl("to.have.class", expected, pattern, "Locator expected to have class matching regex", convertType(options, FrameExpectOptions.class));
+    expectImpl("to.have.class", expected, pattern, "Locator expected to have class matching regex", convertViaJson(options, FrameExpectOptions.class));
   }
 
   @Override
@@ -129,7 +124,7 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
       expected.string = text;
       list.add(expected);
     }
-    expectImpl("to.have.class.array", list, strings, "Locator expected to have class", convertType(options, FrameExpectOptions.class));
+    expectImpl("to.have.class.array", list, strings, "Locator expected to have class", convertViaJson(options, FrameExpectOptions.class));
   }
 
   @Override
@@ -139,7 +134,7 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
       ExpectedTextValue expected = expectedRegex(pattern);
       list.add(expected);
     }
-    expectImpl("to.have.class.array", list, patterns, "Locator expected to have class matching regex", convertType(options, FrameExpectOptions.class));
+    expectImpl("to.have.class.array", list, patterns, "Locator expected to have class matching regex", convertViaJson(options, FrameExpectOptions.class));
   }
 
   @Override
@@ -147,8 +142,8 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
     if (options == null) {
       options = new HasCountOptions();
     }
-    FrameExpectOptions commonOptions = convertType(options, FrameExpectOptions.class);
-    commonOptions.expectedNumber = (double) count;
+    FrameExpectOptions commonOptions = convertViaJson(options, FrameExpectOptions.class);
+    commonOptions.expectedNumber = count;
     List<ExpectedTextValue> expectedText = null;
     expectImpl("to.have.count", expectedText, count, "Locator expected to have count", commonOptions);
   }
@@ -170,7 +165,7 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
     if (options == null) {
       options = new HasCSSOptions();
     }
-    FrameExpectOptions commonOptions = convertType(options, FrameExpectOptions.class);
+    FrameExpectOptions commonOptions = convertViaJson(options, FrameExpectOptions.class);
     commonOptions.expressionArg = name;
     String message = "Locator expected to have CSS property '" + name + "'";
     if (expectedValue instanceof Pattern) {
@@ -183,13 +178,7 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
   public void hasId(String id, HasIdOptions options) {
     ExpectedTextValue expected = new ExpectedTextValue();
     expected.string = id;
-    expectImpl("to.have.id", expected, id, "Locator expected to have ID", convertType(options, FrameExpectOptions.class));
-  }
-
-  @Override
-  public void hasId(Pattern pattern, HasIdOptions options) {
-    ExpectedTextValue expected = expectedRegex(pattern);
-    expectImpl("to.have.id", expected, pattern, "Locator expected to have ID matching regex", convertType(options, FrameExpectOptions.class));
+    expectImpl("to.have.id", expected, id, "Locator expected to have ID", convertViaJson(options, FrameExpectOptions.class));
   }
 
   @Override
@@ -197,7 +186,7 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
     if (options == null) {
       options = new HasJSPropertyOptions();
     }
-    FrameExpectOptions commonOptions = convertType(options, FrameExpectOptions.class);
+    FrameExpectOptions commonOptions = convertViaJson(options, FrameExpectOptions.class);
     commonOptions.expressionArg = name;
     commonOptions.expectedValue = serializeArgument(value);
     List<ExpectedTextValue> list = null;
@@ -208,20 +197,18 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
   public void hasText(String text, HasTextOptions options) {
     ExpectedTextValue expected = new ExpectedTextValue();
     expected.string = text;
-    expected.ignoreCase = shouldIgnoreCase(options);
     expected.matchSubstring = false;
     expected.normalizeWhiteSpace = true;
-    expectImpl("to.have.text", expected, text, "Locator expected to have text", convertType(options, FrameExpectOptions.class));
+    expectImpl("to.have.text", expected, text, "Locator expected to have text", convertViaJson(options, FrameExpectOptions.class));
   }
 
   @Override
   public void hasText(Pattern pattern, HasTextOptions options) {
     ExpectedTextValue expected = expectedRegex(pattern);
-    expected.ignoreCase = shouldIgnoreCase(options);
     // Just match substring, same as containsText.
     expected.matchSubstring = true;
     expected.normalizeWhiteSpace = true;
-    expectImpl("to.have.text", expected, pattern, "Locator expected to have text matching regex", convertType(options, FrameExpectOptions.class));
+    expectImpl("to.have.text", expected, pattern, "Locator expected to have text matching regex", convertViaJson(options, FrameExpectOptions.class));
   }
 
   @Override
@@ -230,12 +217,11 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
     for (String text : strings) {
       ExpectedTextValue expected = new ExpectedTextValue();
       expected.string = text;
-      expected.ignoreCase = shouldIgnoreCase(options);
       expected.matchSubstring = false;
       expected.normalizeWhiteSpace = true;
       list.add(expected);
     }
-    expectImpl("to.have.text.array", list, strings, "Locator expected to have text", convertType(options, FrameExpectOptions.class));
+    expectImpl("to.have.text.array", list, strings, "Locator expected to have text", convertViaJson(options, FrameExpectOptions.class));
   }
 
   @Override
@@ -243,108 +229,64 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
     List<ExpectedTextValue> list = new ArrayList<>();
     for (Pattern pattern : patterns) {
       ExpectedTextValue expected = expectedRegex(pattern);
-      expected.ignoreCase = shouldIgnoreCase(options);
       expected.matchSubstring = true;
       expected.normalizeWhiteSpace = true;
       list.add(expected);
     }
-    expectImpl("to.have.text.array", list, patterns, "Locator expected to have text matching regex", convertType(options, FrameExpectOptions.class));
+    expectImpl("to.have.text.array", list, patterns, "Locator expected to have text matching regex", convertViaJson(options, FrameExpectOptions.class));
   }
 
   @Override
   public void hasValue(String value, HasValueOptions options) {
     ExpectedTextValue expected = new ExpectedTextValue();
     expected.string = value;
-    expectImpl("to.have.value", expected, value, "Locator expected to have value", convertType(options, FrameExpectOptions.class));
+    expectImpl("to.have.value", expected, value, "Locator expected to have value", convertViaJson(options, FrameExpectOptions.class));
   }
 
   @Override
   public void hasValue(Pattern pattern, HasValueOptions options) {
     ExpectedTextValue expected = expectedRegex(pattern);
-    expectImpl("to.have.value", expected, pattern, "Locator expected to have value matching regex", convertType(options, FrameExpectOptions.class));
-  }
-
-  @Override
-  public void hasValues(String[] values, HasValuesOptions options) {
-    List<ExpectedTextValue> list = new ArrayList<>();
-    for (String text : values) {
-      ExpectedTextValue expected = new ExpectedTextValue();
-      expected.string = text;
-      list.add(expected);
-    }
-    expectImpl("to.have.values", list, values, "Locator expected to have values", convertType(options, FrameExpectOptions.class));
-  }
-
-  @Override
-  public void hasValues(Pattern[] patterns, HasValuesOptions options) {
-    List<ExpectedTextValue> list = new ArrayList<>();
-    for (Pattern pattern : patterns) {
-      ExpectedTextValue expected = expectedRegex(pattern);
-      expected.matchSubstring = true;
-      list.add(expected);
-    }
-    expectImpl("to.have.values", list, patterns, "Locator expected to have values matching regex", convertType(options, FrameExpectOptions.class));
+    expectImpl("to.have.value", expected, pattern, "Locator expected to have value matching regex", convertViaJson(options, FrameExpectOptions.class));
   }
 
   @Override
   public void isChecked(IsCheckedOptions options) {
-    boolean unchecked = options != null && options.checked != null && !options.checked;
-    String expression = unchecked ? "to.be.unchecked" : "to.be.checked";
-    String message = "Locator expected to be " + (unchecked ? "un" : "") + "checked";
-    expectTrue(expression, message, convertType(options, FrameExpectOptions.class));
+    expectTrue("to.be.checked", "Locator expected to be checked", convertViaJson(options, FrameExpectOptions.class));
   }
 
   @Override
   public void isDisabled(IsDisabledOptions options) {
-    expectTrue("to.be.disabled", "Locator expected to be disabled", convertType(options, FrameExpectOptions.class));
+    expectTrue("to.be.disabled", "Locator expected to be disabled", convertViaJson(options, FrameExpectOptions.class));
   }
 
   @Override
   public void isEditable(IsEditableOptions options) {
-    FrameExpectOptions frameOptions = convertType(options, FrameExpectOptions.class);
-    boolean editable = options == null || options.editable == null || options.editable == true;
-    String message = "Locator expected to be " + (editable ? "editable" : "readonly");
-    expectTrue(editable ? "to.be.editable" : "to.be.readonly", message, frameOptions);
+    expectTrue("to.be.editable", "Locator expected to be editable", convertViaJson(options, FrameExpectOptions.class));
   }
 
   @Override
   public void isEmpty(IsEmptyOptions options) {
-    expectTrue("to.be.empty", "Locator expected to be empty", convertType(options, FrameExpectOptions.class));
+    expectTrue("to.be.empty", "Locator expected to be empty", convertViaJson(options, FrameExpectOptions.class));
   }
 
   @Override
   public void isEnabled(IsEnabledOptions options) {
-    FrameExpectOptions frameOptions = convertType(options, FrameExpectOptions.class);
-    boolean enabled = options == null || options.enabled == null || options.enabled == true;
-    String message = "Locator expected to be " + (enabled ? "enabled" : "disabled");
-    expectTrue(enabled ? "to.be.enabled" : "to.be.disabled", message, frameOptions);
+    expectTrue("to.be.enabled", "Locator expected to be enabled", convertViaJson(options, FrameExpectOptions.class));
   }
 
   @Override
   public void isFocused(IsFocusedOptions options) {
-    expectTrue("to.be.focused", "Locator expected to be focused", convertType(options, FrameExpectOptions.class));
+    expectTrue("to.be.focused", "Locator expected to be focused", convertViaJson(options, FrameExpectOptions.class));
   }
 
   @Override
   public void isHidden(IsHiddenOptions options) {
-    expectTrue("to.be.hidden", "Locator expected to be hidden", convertType(options, FrameExpectOptions.class));
-  }
-
-  @Override
-  public void isInViewport(IsInViewportOptions options) {
-    FrameExpectOptions expectOptions = convertType(options, FrameExpectOptions.class);
-    if (options != null && options.ratio != null) {
-      expectOptions.expectedNumber = options.ratio;
-    }
-    expectTrue("to.be.in.viewport", "Locator expected to be in viewport",  expectOptions);
+    expectTrue("to.be.hidden", "Locator expected to be hidden", convertViaJson(options, FrameExpectOptions.class));
   }
 
   @Override
   public void isVisible(IsVisibleOptions options) {
-    FrameExpectOptions frameOptions = convertType(options, FrameExpectOptions.class);
-    boolean visible = options == null || options.visible == null || options.visible == true;
-    String message = "Locator expected to be " + (visible ? "visible" : "hidden");
-    expectTrue(visible ? "to.be.visible" : "to.be.hidden", message, frameOptions);
+    expectTrue("to.be.visible", "Locator expected to be visible", convertViaJson(options, FrameExpectOptions.class));
   }
 
   private void expectTrue(String expression, String message, FrameExpectOptions options) {
@@ -356,25 +298,5 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
   public LocatorAssertions not() {
     return new LocatorAssertionsImpl(actualLocator, !isNot);
   }
-
-  @Override
-  public void isAttached(IsAttachedOptions options) {
-    FrameExpectOptions frameOptions = convertType(options, FrameExpectOptions.class);
-    boolean attached = options == null || options.attached == null || options.attached == true;
-    String message = "Locator expected to be " + (attached ? "attached" : "detached");
-    expectTrue(attached ? "to.be.attached" : "to.be.detached", message, frameOptions);
-  }
-
-  private static Boolean shouldIgnoreCase(Object options) {
-    if (options == null) {
-      return null;
-    }
-    try {
-      Field fromField = options.getClass().getDeclaredField("ignoreCase");
-      Object value = fromField.get(options);
-      return (Boolean) value;
-    } catch (NoSuchFieldException | IllegalAccessException e) {
-      return null;
-    }
-  }
 }
+

assertions/src/main/java/com/microsoft/playwright/impl/PageAssertionsImpl.java

@@ -22,7 +22,7 @@ import com.microsoft.playwright.assertions.PageAssertions;
 import java.util.regex.Pattern;
 
 import static com.microsoft.playwright.impl.UrlMatcher.resolveUrl;
-import static com.microsoft.playwright.impl.Utils.convertType;
+import static com.microsoft.playwright.impl.Utils.convertViaJson;
 
 public class PageAssertionsImpl extends AssertionsBase implements PageAssertions {
   private final PageImpl actualPage;
@@ -40,14 +40,13 @@ public class PageAssertionsImpl extends AssertionsBase implements PageAssertions
   public void hasTitle(String title, HasTitleOptions options) {
     ExpectedTextValue expected = new ExpectedTextValue();
     expected.string = title;
-    expected.normalizeWhiteSpace = true;
-    expectImpl("to.have.title", expected, title, "Page title expected to be", convertType(options, FrameExpectOptions.class));
+    expectImpl("to.have.title", expected, title, "Page title expected to be", convertViaJson(options, FrameExpectOptions.class));
   }
 
   @Override
   public void hasTitle(Pattern pattern, HasTitleOptions options) {
     ExpectedTextValue expected = expectedRegex(pattern);
-    expectImpl("to.have.title", expected, pattern, "Page title expected to match regex", convertType(options, FrameExpectOptions.class));
+    expectImpl("to.have.title", expected, pattern, "Page title expected to match regex", convertViaJson(options, FrameExpectOptions.class));
   }
 
   @Override
@@ -57,13 +56,13 @@ public class PageAssertionsImpl extends AssertionsBase implements PageAssertions
       url = resolveUrl(actualPage.context().baseUrl, url);
     }
     expected.string = url;
-    expectImpl("to.have.url", expected, url, "Page URL expected to be", convertType(options, FrameExpectOptions.class));
+    expectImpl("to.have.url", expected, url, "Page URL expected to be", convertViaJson(options, FrameExpectOptions.class));
   }
 
   @Override
   public void hasURL(Pattern pattern, HasURLOptions options) {
     ExpectedTextValue expected = expectedRegex(pattern);
-    expectImpl("to.have.url", expected, pattern, "Page URL expected to match regex", convertType(options, FrameExpectOptions.class));
+    expectImpl("to.have.url", expected, pattern, "Page URL expected to match regex", convertViaJson(options, FrameExpectOptions.class));
   }
 
   @Override

assertions/src/test/java/com/microsoft/playwright/TestLocatorAssertions.java

@@ -0,0 +1,826 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright;
+
+import com.microsoft.playwright.assertions.LocatorAssertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.opentest4j.AssertionFailedError;
+
+import java.util.regex.Pattern;
+
+import static com.microsoft.playwright.Utils.mapOf;
+import static com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat;
+import static org.junit.jupiter.api.Assertions.*;
+
+public class TestLocatorAssertions extends TestBase {
+  @Test
+  void containsTextWRegexPass() {
+    page.setContent("<div id=node>Text   content</div>");
+    Locator locator = page.locator("#node");
+    assertThat(locator).containsText(Pattern.compile("ex"));
+    // Should not normalize whitespace.
+    assertThat(locator).containsText(Pattern.compile("ext   cont"));
+  }
+
+  @Test
+  void containsTextWRegexCaseInsensitivePass() {
+    page.setContent("<div id=node>Text   content</div>");
+    Locator locator = page.locator("#node");
+    assertThat(locator).containsText(Pattern.compile("text", Pattern.CASE_INSENSITIVE));
+  }
+
+  @Test
+  void containsTextWRegexMultilinePass() {
+    page.setContent("<div id=node>Text \nContent</div>");
+    Locator locator = page.locator("#node");
+    assertThat(locator).containsText(Pattern.compile("^Content", Pattern.MULTILINE));
+  }
+
+  @Test
+  void containsTextWRegexDotAllPass() {
+    page.setContent("<div id=node>foo\nbar</div>");
+    Locator locator = page.locator("#node");
+    assertThat(locator).containsText(Pattern.compile("foo.bar", Pattern.DOTALL));
+  }
+
+  @Test
+  void containsTextWRegexFail() {
+    page.setContent("<div id=node>Text   content</div>");
+    Locator locator = page.locator("#node");
+    try {
+      assertThat(locator).containsText(Pattern.compile("ex2"), new LocatorAssertions.ContainsTextOptions().setTimeout(1000));
+      fail("did not throw");
+    } catch (AssertionFailedError e) {
+      assertEquals("ex2", e.getExpected().getStringRepresentation());
+      assertEquals("Text   content", e.getActual().getValue());
+      assertTrue(e.getMessage().contains("Locator expected to contain regex"), e.getMessage());
+    }
+  }
+
+  @Test
+  void hasTextWRegexPass() {
+    page.setContent("<div id=node>Text   content</div>");
+    Locator locator = page.locator("#node");
+    assertThat(locator).hasText(Pattern.compile("Te.t"));
+    // Should not normalize whitespace.
+    assertThat(locator).hasText(Pattern.compile("Text.+content"));
+  }
+
+  @Test
+  void hasTextWRegexFail() {
+    page.setContent("<div id=node>Text   content</div>");
+    Locator locator = page.locator("#node");
+    try {
+      assertThat(locator).hasText(Pattern.compile("Text 2"), new LocatorAssertions.HasTextOptions().setTimeout(1000));
+      fail("did not throw");
+    } catch (AssertionFailedError e) {
+      assertEquals("Text 2", e.getExpected().getStringRepresentation());
+      assertEquals("Text   content", e.getActual().getValue());
+      assertTrue(e.getMessage().contains("Locator expected to have text matching regex"), e.getMessage());
+    }
+  }
+
+  @Test
+  void hasTextWTextPass() {
+    page.setContent("<div id=node><span></span>Text \ncontent&nbsp;    </div>");
+    Locator locator = page.locator("#node");
+    // Should normalize whitespace.
+    assertThat(locator).hasText("Text                        content");
+  }
+
+  @Test
+  void hasTextWTextFail() {
+    page.setContent("<div id=node>Text content</div>");
+    Locator locator = page.locator("#node");
+    // Should normalize whitespace.
+    try {
+      assertThat(locator).hasText("Text", new LocatorAssertions.HasTextOptions().setTimeout(1000));
+      fail("did not throw");
+    } catch (AssertionFailedError e) {
+      assertEquals("Text", e.getExpected().getStringRepresentation());
+      assertEquals("Text content", e.getActual().getValue());
+      assertTrue(e.getMessage().contains("Locator expected to have text"), e.getMessage());
+    }
+  }
+
+  @Test
+  void hasTextWTextArrayPass() {
+    page.setContent("<div>Text    \n1</div><div>Text   2a</div>");
+    Locator locator = page.locator("div");
+    // Should normalize whitespace.
+    assertThat(locator).hasText(new String[] {"Text  1", "Text   2a"});
+  }
+
+  @Test
+  void hasTextWTextArrayPassEmpty() {
+    page.setContent("<div></div>");
+    Locator locator = page.locator("p");
+    // Should normalize whitespace.
+    assertThat(locator).hasText(new String[] {});
+  }
+
+  @Test
+  void hasTextWTextArrayPassNotEmpty() {
+    page.setContent("<div><p>Test</p></div>");
+    Locator locator = page.locator("div");
+    // Should normalize whitespace.
+    assertThat(locator).not().hasText(new String[] {});
+  }
+
+  @Test
+  void hasTextWTextArrayPassOnEmpty() {
+    page.setContent("<div></div>");
+    Locator locator = page.locator("p");
+    // Should normalize whitespace.
+    assertThat(locator).not().hasText(new String[] {"Test"});
+  }
+
+  @Test
+  void hasTextWTextArrayFailOnNotEmpty() {
+    page.setContent("<div></div>");
+    Locator locator = page.locator("p");
+    // Should normalize whitespace.
+    try {
+      assertThat(locator).not().hasText(new String[] {}, new LocatorAssertions.HasTextOptions().setTimeout(1000));
+      fail("did not throw");
+    } catch (AssertionFailedError e) {
+      assertEquals("[]", e.getExpected().getStringRepresentation());
+      assertEquals("null", e.getActual().getStringRepresentation());
+      assertTrue(e.getMessage().contains("Locator expected not to have text"), e.getMessage());
+    }
+  }
+
+  @Test
+  void hasTextWTextArrayPassLazyPass() {
+    page.setContent("<div id=div></div>");
+    Locator locator = page.locator("p");
+    page.evaluate("setTimeout(() => {\n" +
+      "  div.innerHTML = \"<p>Text 1</p><p>Text 2</p>\";\n" +
+      "}, 100);");
+    // Should normalize whitespace.
+    assertThat(locator).hasText(new String[] {"Text  1", "Text   2"}, new LocatorAssertions.HasTextOptions().setTimeout(1000));
+  }
+
+  @Test
+  void hasTextWTextArrayFail() {
+    page.setContent("<div>Text 1</div><div>Text 3</div>");
+    Locator locator = page.locator("div");
+    page.evaluate("setTimeout(() => {\n" +
+      "  div.innerHTML = \"<p>Text 1</p><p>Text 2</p>\";\n" +
+      "}, 100);");
+    try {
+      // Should normalize whitespace.
+      assertThat(locator).hasText(new String[] {"Text 1", "Text 3", "Extra"}, new LocatorAssertions.HasTextOptions().setTimeout(1000));
+      fail("did not throw");
+    } catch (AssertionFailedError e) {
+      assertEquals("[Text 1, Text 3, Extra]", e.getExpected().getStringRepresentation());
+      assertEquals("[Text 1, Text 3]", e.getActual().getStringRepresentation());
+      assertTrue(e.getMessage().contains("Locator expected to have text"), e.getMessage());
+    }
+  }
+
+  @Test
+  void hasTextWRegExArrayPass() {
+    page.setContent("<div>Text    \n1</div><div>Text   2a</div>");
+    Locator locator = page.locator("div");
+    // Should normalize whitespace.
+    assertThat(locator).hasText(new Pattern[] {Pattern.compile( "Text    \n1"), Pattern.compile("Text   \\d+a")});
+  }
+
+  @Test
+  void hasTextWRegExArrayFail() {
+    page.setContent("<div>Text 1</div><div>Text 3</div>");
+    Locator locator = page.locator("div");
+    try {
+      // Should normalize whitespace.
+      assertThat(locator).hasText(new Pattern[] {Pattern.compile( "Text 1"), Pattern.compile("Text   \\d"), Pattern.compile("Extra")}, new LocatorAssertions.HasTextOptions().setTimeout(1000));
+      fail("did not throw");
+    } catch (AssertionFailedError e) {
+      assertEquals("[Text 1, Text   \\d, Extra]", e.getExpected().getStringRepresentation());
+      assertEquals("[Text 1, Text 3]", e.getActual().getStringRepresentation());
+      assertTrue(e.getMessage().contains("Locator expected to have text"), e.getMessage());
+    }
+  }
+
+  @Test
+  void hasAttributeTextPass() {
+    page.setContent("<div id=node>Text content</div>");
+    Locator locator = page.locator("#node");
+    assertThat(locator).hasAttribute("id", "node");
+  }
+
+  @Test
+  void hasAttributeTextFail() {
+    page.setContent("<div id=node>Text content</div>");
+    Locator locator = page.locator("#node");
+    try {
+      assertThat(locator).hasAttribute("id", "foo", new LocatorAssertions.HasAttributeOptions().setTimeout(1000));
+      fail("did not throw");
+    } catch (AssertionFailedError e) {
+      assertEquals("foo", e.getExpected().getStringRepresentation());
+      assertEquals("node", e.getActual().getStringRepresentation());
+      assertTrue(e.getMessage().contains("Locator expected to have attribute 'id'"), e.getMessage());
+    }
+  }
+
+  @Test
+  void hasAttributeRegExpPass() {
+    page.setContent("<div id=node>Text content</div>");
+    Locator locator = page.locator("#node");
+    assertThat(locator).hasAttribute("id", Pattern.compile("n..e"));
+  }
+
+  @Test
+  void hasAttributeRegExpFail() {
+    page.setContent("<div id=node>Text content</div>");
+    Locator locator = page.locator("#node");
+    try {
+      assertThat(locator).hasAttribute("id", Pattern.compile(".Nod.."), new LocatorAssertions.HasAttributeOptions().setTimeout(1000));
+      fail("did not throw");
+    } catch (AssertionFailedError e) {
+      assertEquals(".Nod..", e.getExpected().getStringRepresentation());
+      assertEquals("node", e.getActual().getStringRepresentation());
+      assertTrue(e.getMessage().contains("Locator expected to have attribute 'id' matching regex"), e.getMessage());
+    }
+  }
+
+  @Test
+  void hasClassTextPass() {
+    page.setContent("<div class=\"foo bar baz\"></div>");
+    Locator locator = page.locator("div");
+    assertThat(locator).hasClass("foo bar baz");
+  }
+
+  @Test
+  void hasClassTextFail() {
+    page.setContent("<div class=\"bar baz\"></div>");
+    Locator locator = page.locator("div");
+    try {
+      assertThat(locator).hasClass("foo bar baz", new LocatorAssertions.HasClassOptions().setTimeout(1000));
+      fail("did not throw");
+    } catch (AssertionFailedError e) {
+      assertEquals("foo bar baz", e.getExpected().getStringRepresentation());
+      assertEquals("bar baz", e.getActual().getStringRepresentation());
+      assertTrue(e.getMessage().contains("Locator expected to have class"), e.getMessage());
+    }
+  }
+
+  @Test
+  void hasClassRegExpPass() {
+    page.setContent("<div class=\"foo bar baz\"></div>");
+    Locator locator = page.locator("div");
+    assertThat(locator).hasClass(Pattern.compile("foo.* baz"));
+  }
+
+  @Test
+  void hasClassRegExpFail() {
+    page.setContent("<div class=\"bar baz\"></div>");
+    Locator locator = page.locator("div");
+    try {
+      assertThat(locator).hasClass(Pattern.compile("foo Z.*"), new LocatorAssertions.HasClassOptions().setTimeout(1000));
+      fail("did not throw");
+    } catch (AssertionFailedError e) {
+      assertEquals("foo Z.*", e.getExpected().getStringRepresentation());
+      assertEquals("bar baz", e.getActual().getStringRepresentation());
+      assertTrue(e.getMessage().contains("Locator expected to have class matching regex"), e.getMessage());
+    }
+  }
+
+  @Test
+  void hasClassTextArrayPass() {
+    page.setContent("<div class=\"foo\"></div><div class=\"bar\"></div><div class=\"baz\"></div>");
+    Locator locator = page.locator("div");
+    assertThat(locator).hasClass(new String[] {"foo", "bar", "baz"});
+  }
+
+  @Test
+  void hasClassTextArrayFail() {
+    page.setContent("<div class=\"foo\"></div><div class=\"bar\"></div><div class=\"baz\"></div>");
+    Locator locator = page.locator("div");
+    try {
+      assertThat(locator).hasClass(new String[] {"foo", "bar", "missing"}, new LocatorAssertions.HasClassOptions().setTimeout(1000));
+      fail("did not throw");
+    } catch (AssertionFailedError e) {
+      assertEquals("[foo, bar, missing]", e.getExpected().getStringRepresentation());
+      assertEquals("[foo, bar, baz]", e.getActual().getStringRepresentation());
+      assertTrue(e.getMessage().contains("Locator expected to have class"), e.getMessage());
+    }
+  }
+
+  @Test
+  void hasClassRegExpArrayPass() {
+    page.setContent("<div class=\"foo\"></div><div class=\"bar\"></div><div class=\"baz\"></div>");
+    Locator locator = page.locator("div");
+    assertThat(locator).hasClass(new Pattern[] {Pattern.compile("fo.*"), Pattern.compile(".ar"), Pattern.compile("baz")});
+  }
+
+  @Test
+  void hasClassRegExpArrayFail() {
+    page.setContent("<div class=\"foo\"></div><div class=\"bar\"></div><div class=\"baz\"></div>");
+    Locator locator = page.locator("div");
+    try {
+      assertThat(locator).hasClass(new Pattern[] {Pattern.compile("fo.*"), Pattern.compile(".ar"), Pattern.compile("baz"), Pattern.compile("extra")}, new LocatorAssertions.HasClassOptions().setTimeout(1000));
+      fail("did not throw");
+    } catch (AssertionFailedError e) {
+      assertEquals("[fo.*, .ar, baz, extra]", e.getExpected().getStringRepresentation());
+      assertEquals("[foo, bar, baz]", e.getActual().getStringRepresentation());
+      assertTrue(e.getMessage().contains("Locator expected to have class matching regex"), e.getMessage());
+    }
+  }
+
+  @Test
+  void hasCountPass() {
+    page.setContent("<select><option>One</option><option>Two</option></select>");
+    Locator locator = page.locator("option");
+    assertThat(locator).hasCount(2);
+  }
+
+  @Test
+  void hasCountFail() {
+    page.setContent("<select><option>One</option><option>Two</option></select>");
+    Locator locator = page.locator("option");
+    try {
+      assertThat(locator).hasCount(1, new LocatorAssertions.HasCountOptions().setTimeout(1000));
+      fail("did not throw");
+    } catch (AssertionFailedError e) {
+      assertEquals("1", e.getExpected().getStringRepresentation());
+      assertEquals("2", e.getActual().getStringRepresentation());
+      assertTrue(e.getMessage().contains("Locator expected to have count"), e.getMessage());
+    }
+  }
+
+  @Test
+  void hasCountPassZero() {
+    page.setContent("<div></div>");
+    Locator locator = page.locator("span");
+    assertThat(locator).hasCount(0);
+    assertThat(locator).not().hasCount(1);
+  }
+
+  @Test
+  void hasCSSPass() {
+    page.setContent("<div id=node style='color: rgb(255, 0, 0)'>Text content</div>");
+    Locator locator = page.locator("#node");
+    assertThat(locator).hasCSS("color", "rgb(255, 0, 0)");
+  }
+
+  @Test
+  void hasCSSFail() {
+    page.setContent("<div id=node style='color: rgb(255, 0, 0)'>Text content</div>");
+    Locator locator = page.locator("#node");
+    try {
+      assertThat(locator).hasCSS("color", "red", new LocatorAssertions.HasCSSOptions().setTimeout(1000));
+      fail("did not throw");
+    } catch (AssertionFailedError e) {
+      assertEquals("red", e.getExpected().getStringRepresentation());
+      assertEquals("rgb(255, 0, 0)", e.getActual().getStringRepresentation());
+      assertTrue(e.getMessage().contains("Locator expected to have CSS property 'color'"), e.getMessage());
+    }
+  }
+
+  @Test
+  void hasCSSRegExPass() {
+    page.setContent("<div id=node style='color: rgb(255, 0, 0)'>Text content</div>");
+    Locator locator = page.locator("#node");
+    assertThat(locator).hasCSS("color", Pattern.compile("rgb.*"));
+  }
+
+  @Test
+  void hasCSSRegExFail() {
+    page.setContent("<div id=node style='color: rgb(255, 0, 0)'>Text content</div>");
+    Locator locator = page.locator("#node");
+    try {
+      assertThat(locator).hasCSS("color", Pattern.compile("red"), new LocatorAssertions.HasCSSOptions().setTimeout(1000));
+      fail("did not throw");
+    } catch (AssertionFailedError e) {
+      assertEquals("red", e.getExpected().getStringRepresentation());
+      assertEquals("rgb(255, 0, 0)", e.getActual().getStringRepresentation());
+      assertTrue(e.getMessage().contains("Locator expected to have CSS property 'color' matching regex"), e.getMessage());
+    }
+  }
+
+  @Test
+  void hasIdPass() {
+    page.setContent("<div id=node>Text content</div>");
+    Locator locator = page.locator("#node");
+    assertThat(locator).hasId("node");
+  }
+
+  @Test
+  void hasIdFail() {
+    page.setContent("<div id=node>Text content</div>");
+    Locator locator = page.locator("#node");
+    try {
+      assertThat(locator).hasId("foo", new LocatorAssertions.HasIdOptions().setTimeout(1000));
+      fail("did not throw");
+    } catch (AssertionFailedError e) {
+      assertEquals("foo", e.getExpected().getStringRepresentation());
+      assertEquals("node", e.getActual().getStringRepresentation());
+      assertTrue(e.getMessage().contains("Locator expected to have ID"), e.getMessage());
+    }
+  }
+
+  @Test
+  void hasJSPropertyPass() {
+    page.setContent("<div></div>");
+    page.evalOnSelector("div", "e => e.foo = { a: 1, b: 'string' }");
+    Locator locator = page.locator("div");
+    assertThat(locator).hasJSProperty("foo", mapOf("a", 1, "b", "string"));
+  }
+
+  @Test
+  void hasJSPropertyNumberFail() {
+    page.setContent("<div id=node>Text content</div>");
+    Locator locator = page.locator("#node");
+    page.evalOnSelector("div", "e => e.foo = 2021");
+    try {
+      assertThat(locator).hasJSProperty("foo", 1, new LocatorAssertions.HasJSPropertyOptions().setTimeout(1000));
+      fail("did not throw");
+    } catch (AssertionFailedError e) {
+      assertEquals("1", e.getExpected().getStringRepresentation());
+      assertEquals("2021", e.getActual().getStringRepresentation());
+      assertTrue(e.getMessage().contains("Locator expected to have JavaScript property 'foo'"), e.getMessage());
+    }
+  }
+
+  @Test
+  void hasJSPropertyObjectFail() {
+    page.setContent("<div id=node>Text content</div>");
+    Locator locator = page.locator("#node");
+    page.evalOnSelector("div", "e => e.foo = { a: 1, b: 'string' }");
+    try {
+      assertThat(locator).hasJSProperty("foo", mapOf("a", 2), new LocatorAssertions.HasJSPropertyOptions().setTimeout(1000));
+      fail("did not throw");
+    } catch (AssertionFailedError e) {
+      assertEquals("{a=2}", e.getExpected().getStringRepresentation());
+      assertEquals("{a=1, b=string}", e.getActual().getStringRepresentation());
+      assertTrue(e.getMessage().contains("Locator expected to have JavaScript property 'foo'"), e.getMessage());
+    }
+  }
+
+  @Test
+  void hasJSPropertyStringFail() {
+    page.setContent("<div id=node>Text content</div>");
+    Locator locator = page.locator("#node");
+    try {
+      assertThat(locator).hasJSProperty("id", "foo", new LocatorAssertions.HasJSPropertyOptions().setTimeout(1000));
+      fail("did not throw");
+    } catch (AssertionFailedError e) {
+      assertEquals("foo", e.getExpected().getStringRepresentation());
+      assertEquals("node", e.getActual().getStringRepresentation());
+      assertTrue(e.getMessage().contains("Locator expected to have JavaScript property 'id'"), e.getMessage());
+    }
+  }
+
+  @Test
+  void hasValueTextPass() {
+    page.setContent("<input id=node></input>");
+    Locator locator = page.locator("#node");
+    locator.fill("Text content");
+    assertThat(locator).hasValue("Text content");
+  }
+
+  @Test
+  void hasValueTextFail() {
+    page.setContent("<input id=node></input>");
+    Locator locator = page.locator("#node");
+    locator.fill("Text content");
+    try {
+      assertThat(locator).hasValue("Text2", new LocatorAssertions.HasValueOptions().setTimeout(1000));
+      fail("did not throw");
+    } catch (AssertionFailedError e) {
+      assertEquals("Text2", e.getExpected().getStringRepresentation());
+      assertEquals("Text content", e.getActual().getStringRepresentation());
+      assertTrue(e.getMessage().contains("Locator expected to have value"), e.getMessage());
+    }
+  }
+
+  @Test
+  void hasValueRegExpPass() {
+    page.setContent("<input id=node></input>");
+    Locator locator = page.locator("#node");
+    locator.fill("Text content");
+    assertThat(locator).hasValue(Pattern.compile("Text"));
+  }
+
+  @Test
+  void hasValueRegExpPassWithNot() {
+    page.setContent("<input id=node></input>");
+    Locator locator = page.locator("#node");
+    locator.fill("Text content");
+    assertThat(locator).not().hasValue(Pattern.compile("Text2"));
+  }
+
+  @Test
+  void hasValueRegExpFail() {
+    page.setContent("<input id=node></input>");
+    Locator locator = page.locator("#node");
+    locator.fill("Text content");
+    try {
+      assertThat(locator).hasValue(Pattern.compile("Text2"), new LocatorAssertions.HasValueOptions().setTimeout(1000));
+      fail("did not throw");
+    } catch (AssertionFailedError e) {
+      assertEquals("Text2", e.getExpected().getStringRepresentation());
+      assertEquals("Text content", e.getActual().getStringRepresentation());
+      assertTrue(e.getMessage().contains("Locator expected to have value matching regex"), e.getMessage());
+    }
+  }
+
+  @Test
+  void isCheckedPass() {
+    page.setContent("<input type=checkbox checked></input>");
+    Locator locator = page.locator("input");
+    assertThat(locator).isChecked();
+  }
+
+  @Test
+  void isCheckedFail() {
+    page.setContent("<input type=checkbox></input>");
+    Locator locator = page.locator("input");
+    try {
+      assertThat(locator).isChecked(new LocatorAssertions.IsCheckedOptions().setTimeout(1000));
+      fail("did not throw");
+    } catch (AssertionFailedError e) {
+      assertNull(e.getExpected());
+      assertNull(e.getActual());
+      assertTrue(e.getMessage().contains("Locator expected to be checked"), e.getMessage());
+    }
+  }
+
+  @Test
+  void notIsCheckedFail() {
+    page.setContent("<input type=checkbox checked></input>");
+    Locator locator = page.locator("input");
+    try {
+      assertThat(locator).not().isChecked(new LocatorAssertions.IsCheckedOptions().setTimeout(1000));
+      fail("did not throw");
+    } catch (AssertionFailedError e) {
+      assertNull(e.getExpected());
+      assertNull(e.getActual());
+      assertTrue(e.getMessage().contains("Locator expected not to be checked"), e.getMessage());
+    }
+  }
+
+  @Test
+  void isDisabledPass() {
+    page.setContent("<button disabled>Text</button>");
+    Locator locator = page.locator("button");
+    assertThat(locator).isDisabled();
+  }
+
+  @Test
+  void isDisabledFail() {
+    page.setContent("<button>Text</button>");
+    Locator locator = page.locator("button");
+    try {
+      assertThat(locator).isDisabled(new LocatorAssertions.IsDisabledOptions().setTimeout(1000));
+      fail("did not throw");
+    } catch (AssertionFailedError e) {
+      assertNull(e.getExpected());
+      assertNull(e.getActual());
+      assertTrue(e.getMessage().contains("Locator expected to be disabled"), e.getMessage());
+    }
+  }
+
+  @Test
+  void notIsDisabledFail() {
+    page.setContent("<button disabled>Text</button>");
+    Locator locator = page.locator("button");
+    try {
+      assertThat(locator).not().isDisabled(new LocatorAssertions.IsDisabledOptions().setTimeout(1000));
+      fail("did not throw");
+    } catch (AssertionFailedError e) {
+      assertNull(e.getExpected());
+      assertNull(e.getActual());
+      assertTrue(e.getMessage().contains("Locator expected not to be disabled"), e.getMessage());
+    }
+  }
+
+  @Test
+  void isEditablePass() {
+    page.setContent("<input></input>");
+    Locator locator = page.locator("input");
+    assertThat(locator).isEditable();
+  }
+
+  @Test
+  void isEditableFail() {
+    page.setContent("<input disabled></input>");
+    Locator locator = page.locator("input");
+    try {
+      assertThat(locator).isEditable(new LocatorAssertions.IsEditableOptions().setTimeout(1000));
+      fail("did not throw");
+    } catch (AssertionFailedError e) {
+      assertNull(e.getExpected());
+      assertNull(e.getActual());
+      assertTrue(e.getMessage().contains("Locator expected to be editable"), e.getMessage());
+    }
+  }
+
+  @Test
+  void notIsEditableFail() {
+    page.setContent("<input></input>");
+    Locator locator = page.locator("input");
+    try {
+      assertThat(locator).not().isEditable(new LocatorAssertions.IsEditableOptions().setTimeout(1000));
+      fail("did not throw");
+    } catch (AssertionFailedError e) {
+      assertNull(e.getExpected());
+      assertNull(e.getActual());
+      assertTrue(e.getMessage().contains("Locator expected not to be editable"), e.getMessage());
+    }
+  }
+
+
+  @Test
+  void isEmptyPass() {
+    page.setContent("<input></input>");
+    Locator locator = page.locator("input");
+    assertThat(locator).isEmpty();
+  }
+
+  @Test
+  void isEmptyFail() {
+    page.setContent("<input value=text></input>");
+    Locator locator = page.locator("input");
+    try {
+      assertThat(locator).isEmpty(new LocatorAssertions.IsEmptyOptions().setTimeout(1000));
+      fail("did not throw");
+    } catch (AssertionFailedError e) {
+      assertNull(e.getExpected());
+      assertNull(e.getActual());
+      assertTrue(e.getMessage().contains("Locator expected to be empty"), e.getMessage());
+    }
+  }
+
+  @Test
+  void notIsEmptyFail() {
+    page.setContent("<input></input>");
+    Locator locator = page.locator("input");
+    try {
+      assertThat(locator).not().isEmpty(new LocatorAssertions.IsEmptyOptions().setTimeout(1000));
+      fail("did not throw");
+    } catch (AssertionFailedError e) {
+      assertNull(e.getExpected());
+      assertNull(e.getActual());
+      assertTrue(e.getMessage().contains("Locator expected not to be empty"), e.getMessage());
+    }
+  }
+
+  @Test
+  void isEnabledPass() {
+    page.setContent("<button>Text</button>");
+    Locator locator = page.locator("button");
+    assertThat(locator).isEnabled();
+  }
+
+  @Test
+  void isEnabledFail() {
+    page.setContent("<button disabled>Text</button>");
+    Locator locator = page.locator("button");
+    try {
+      assertThat(locator).isEnabled(new LocatorAssertions.IsEnabledOptions().setTimeout(1000));
+      fail("did not throw");
+    } catch (AssertionFailedError e) {
+      assertNull(e.getExpected());
+      assertNull(e.getActual());
+      assertTrue(e.getMessage().contains("Locator expected to be enabled"), e.getMessage());
+    }
+  }
+
+  @Test
+  void notIsEnabledFail() {
+    page.setContent("<button>Text</button>");
+    Locator locator = page.locator("button");
+    try {
+      assertThat(locator).not().isEnabled(new LocatorAssertions.IsEnabledOptions().setTimeout(1000));
+      fail("did not throw");
+    } catch (AssertionFailedError e) {
+      assertNull(e.getExpected());
+      assertNull(e.getActual());
+      assertTrue(e.getMessage().contains("Locator expected not to be enabled"), e.getMessage());
+    }
+  }
+
+  @Test
+  void isFocusedPass() {
+    page.setContent("<input></input>");
+    Locator locator = page.locator("input");
+    locator.focus();
+    assertThat(locator).isFocused();
+  }
+
+  @Test
+  void isFocusedFail() {
+    page.setContent("<input></input>");
+    Locator locator = page.locator("input");
+    try {
+      assertThat(locator).isFocused(new LocatorAssertions.IsFocusedOptions().setTimeout(1000));
+      fail("did not throw");
+    } catch (AssertionFailedError e) {
+      assertNull(e.getExpected());
+      assertNull(e.getActual());
+      assertTrue(e.getMessage().contains("Locator expected to be focused"), e.getMessage());
+    }
+  }
+
+  @Test
+  void notIsFocusedFail() {
+    page.setContent("<input></input>");
+    Locator locator = page.locator("input");
+    locator.focus();
+    try {
+      assertThat(locator).not().isFocused(new LocatorAssertions.IsFocusedOptions().setTimeout(1000));
+      fail("did not throw");
+    } catch (AssertionFailedError e) {
+      assertNull(e.getExpected());
+      assertNull(e.getActual());
+      assertTrue(e.getMessage().contains("Locator expected not to be focused"), e.getMessage());
+    }
+  }
+
+  @Test
+  void isHiddenPass() {
+    page.setContent("<button style='display: none'></button>");
+    Locator locator = page.locator("button");
+    assertThat(locator).isHidden();
+  }
+
+  @Test
+  void isHiddenFail() {
+    page.setContent("<button></button>");
+    Locator locator = page.locator("button");
+    try {
+      assertThat(locator).isHidden(new LocatorAssertions.IsHiddenOptions().setTimeout(1000));
+      fail("did not throw");
+    } catch (AssertionFailedError e) {
+      assertNull(e.getExpected());
+      assertNull(e.getActual());
+      assertTrue(e.getMessage().contains("Locator expected to be hidden"), e.getMessage());
+    }
+  }
+
+  @Test
+  void notIsHiddenFail() {
+    page.setContent("<button style='display: none'></button>");
+    Locator locator = page.locator("button");
+    try {
+      assertThat(locator).not().isHidden(new LocatorAssertions.IsHiddenOptions().setTimeout(1000));
+      fail("did not throw");
+    } catch (AssertionFailedError e) {
+      assertNull(e.getExpected());
+      assertNull(e.getActual());
+      assertTrue(e.getMessage().contains("Locator expected not to be hidden"), e.getMessage());
+    }
+  }
+
+  @Test
+  void isVisiblePass() {
+    page.setContent("<input></input>");
+    Locator locator = page.locator("input");
+    assertThat(locator).isVisible();
+  }
+
+  @Test
+  void isVisibleFail() {
+    page.setContent("<input style='display: none'></input>");
+    Locator locator = page.locator("input");
+    try {
+      assertThat(locator).isVisible(new LocatorAssertions.IsVisibleOptions().setTimeout(1000));
+      fail("did not throw");
+    } catch (AssertionFailedError e) {
+      assertNull(e.getExpected());
+      assertNull(e.getActual());
+      assertTrue(e.getMessage().contains("Locator expected to be visible"), e.getMessage());
+    }
+  }
+
+  @Test
+  void notIsVisibleFail() {
+    page.setContent("<input></input>");
+    Locator locator = page.locator("input");
+    try {
+      assertThat(locator).not().isVisible(new LocatorAssertions.IsVisibleOptions().setTimeout(1000));
+      fail("did not throw");
+    } catch (AssertionFailedError e) {
+      assertNull(e.getExpected());
+      assertNull(e.getActual());
+      assertTrue(e.getMessage().contains("Locator expected not to be visible"), e.getMessage());
+    }
+  }
+}

assertions/src/test/java/com/microsoft/playwright/TestLocatorFrame.java

@@ -16,7 +16,6 @@
 
 package com.microsoft.playwright;
 
-import com.microsoft.playwright.options.AriaRole;
 import org.junit.jupiter.api.Test;
 
 import java.net.MalformedURLException;
@@ -31,14 +30,13 @@ public class TestLocatorFrame extends TestBase {
       .setBody("<iframe src='iframe.html'></iframe>").setContentType("text/html")));
     page.route("**/iframe.html", route -> {
       route.fulfill(new Route.FulfillOptions().setBody("<html>\n" +
-        "  <div>\n" +
-        "    <button data-testid=\"buttonId\">Hello iframe</button>\n" +
-        "    <iframe src=\"iframe-2.html\"></iframe>\n" +
-        "  </div>\n" +
-        "  <span>1</span>\n" +
-        "  <span>2</span>\n" +
-        "  <label for=target>Name</label><input id=target type=text placeholder=Placeholder title=Title alt=Alternative>\n" +
-        "</html>").setContentType("text/html"));
+        "          <div>\n" +
+        "            <button>Hello iframe</button>\n" +
+        "            <iframe src='iframe-2.html'></iframe>\n" +
+        "          </div>\n" +
+        "          <span>1</span>\n" +
+        "          <span>2</span>\n" +
+        "        </html>").setContentType("text/html"));
     });
     page.route("**/iframe-2.html", route -> {
       route.fulfill(new Route.FulfillOptions().setBody("<html><button>Hello nested iframe</button></html>").setContentType("text/html"));
@@ -101,10 +99,12 @@ public class TestLocatorFrame extends TestBase {
   @Test
   void shouldWaitForFrame() {
     page.navigate(server.EMPTY_PAGE);
-    PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
+    try {
       page.frameLocator("iframe").locator("span").click(new Locator.ClickOptions().setTimeout(300));
-    });
-    assertTrue(e.getMessage().contains("waiting for frameLocator(\"iframe\")"), e.getMessage());
+      fail("did not throw");
+    } catch (PlaywrightException e) {
+      assertTrue(e.getMessage().contains("waiting for frame \"iframe\""), e.getMessage());
+    }
   }
 
   @Test
@@ -206,9 +206,13 @@ public class TestLocatorFrame extends TestBase {
     routeIframe(page);
     page.setContent("<div></div>");
     Locator button = page.frameLocator("div").locator("button");
-    PlaywrightException e = assertThrows(PlaywrightException.class, () -> button.waitFor());
-    assertTrue(e.getMessage().contains("<div></div>"), e.getMessage());
-    assertTrue(e.getMessage().contains("<iframe> was expected"), e.getMessage());
+    try {
+      button.waitFor();
+      fail("did not throw");
+    } catch (PlaywrightException e) {
+      assertTrue(e.getMessage().contains("<div></div>"), e.getMessage());
+      assertTrue(e.getMessage().contains("<iframe> was expected"), e.getMessage());
+    }
   }
 
   @Test
@@ -227,8 +231,12 @@ public class TestLocatorFrame extends TestBase {
     routeAmbiguous(page);
     page.navigate(server.EMPTY_PAGE);
     Locator button = page.locator("body").frameLocator("iframe").locator("button");
-    PlaywrightException e = assertThrows(PlaywrightException.class, () -> button.waitFor());
-    assertTrue(e.getMessage().contains("Error: strict mode violation: locator(\"body\").locator(\"iframe\") resolved to 3 elements"), e.getMessage());
+    try {
+      button.waitFor();
+      fail("did not throw");
+    } catch (PlaywrightException e) {
+      assertTrue(e.getMessage().contains("Error: strict mode violation: \"body >> iframe\" resolved to 3 elements"), e.getMessage());
+    }
   }
 
   @Test
@@ -243,24 +251,4 @@ public class TestLocatorFrame extends TestBase {
     assertThat(button3).hasText("Hello from iframe-3.html");
   }
 
-  @Test
-  void getByCoverage() {
-    routeIframe(page);
-    page.navigate(server.EMPTY_PAGE);
-    Locator button1 = page.frameLocator("iframe").getByRole(AriaRole.BUTTON);
-    Locator button2 = page.frameLocator("iframe").getByText("Hello");
-    Locator button3 = page.frameLocator("iframe").getByTestId("buttonId");
-    assertThat(button1).hasText("Hello iframe");
-    assertThat(button2).hasText("Hello iframe");
-    assertThat(button3).hasText("Hello iframe");
-    Locator input1 = page.frameLocator("iframe").getByLabel("Name");
-    assertThat(input1).hasValue("");
-    Locator input2 = page.frameLocator("iframe").getByPlaceholder("Placeholder");
-    assertThat(input2).hasValue("");
-    Locator input3 = page.frameLocator("iframe").getByAltText("Alternative");
-    assertThat(input3).hasValue("");
-    Locator input4 = page.frameLocator("iframe").getByTitle("Title");
-    assertThat(input4).hasValue("");
-  }
-
 }

assertions/src/test/java/com/microsoft/playwright/TestPageAssertions.java

@@ -35,12 +35,14 @@ public class TestPageAssertions extends TestBase {
   @Test
   void hasURLTextFail() {
     page.navigate("data:text/html,<div>B</div>");
-    AssertionFailedError e = assertThrows(AssertionFailedError.class, () -> {
+    try {
       assertThat(page).hasURL("foo", new PageAssertions.HasURLOptions().setTimeout(1_000));
-    });
-    assertEquals("foo", e.getExpected().getValue());
-    assertEquals("data:text/html,<div>B</div>", e.getActual().getValue());
-    assertTrue(e.getMessage().contains("Page URL expected to be"), e.getMessage());
+      fail("did not throw");
+    } catch (AssertionFailedError e) {
+      assertEquals("foo", e.getExpected().getValue());
+      assertEquals("data:text/html,<div>B</div>", e.getActual().getValue());
+      assertTrue(e.getMessage().contains("Page URL expected to be"), e.getMessage());
+    }
   }
 
   @Test
@@ -67,12 +69,14 @@ public class TestPageAssertions extends TestBase {
   @Test
   void hasURLRegexFail() {
     page.navigate(server.EMPTY_PAGE);
-    AssertionFailedError e = assertThrows(AssertionFailedError.class, () -> {
+    try {
       assertThat(page).hasURL(Pattern.compile(".*foo.*"), new PageAssertions.HasURLOptions().setTimeout(1_000));
-    });
-    assertEquals(".*foo.*", e.getExpected().getStringRepresentation());
-    assertEquals(server.EMPTY_PAGE, e.getActual().getValue());
-    assertTrue(e.getMessage().contains("Page URL expected to match regex"), e.getMessage());
+      fail("did not throw");
+    } catch (AssertionFailedError e) {
+      assertEquals(".*foo.*", e.getExpected().getStringRepresentation());
+      assertEquals(server.EMPTY_PAGE, e.getActual().getValue());
+      assertTrue(e.getMessage().contains("Page URL expected to match regex"), e.getMessage());
+    }
   }
 
   @Test
@@ -87,21 +91,17 @@ public class TestPageAssertions extends TestBase {
     assertThat(page).hasTitle("Woof-Woof", new PageAssertions.HasTitleOptions().setTimeout(1_000));
   }
 
-  @Test
-  void hasTitleTextNormalizeWhitespaces() {
-    page.setContent("<title>     Foo     Bar    </title>");
-    assertThat(page).hasTitle("  Foo  Bar", new PageAssertions.HasTitleOptions().setTimeout(1_000));
-  }
-
   @Test
   void hasTitleTextFail() {
     page.navigate(server.PREFIX + "/title.html");
-    AssertionFailedError e = assertThrows(AssertionFailedError.class, () -> {
+    try {
       assertThat(page).hasTitle("foo", new PageAssertions.HasTitleOptions().setTimeout(1_000));
-    });
-    assertEquals("foo", e.getExpected().getValue());
-    assertEquals("Woof-Woof", e.getActual().getValue());
-    assertTrue(e.getMessage().contains("Page title expected to be: foo\nReceived: Woof-Woof"), e.getMessage());
+      fail("did not throw");
+    } catch (AssertionFailedError e) {
+      assertEquals("foo", e.getExpected().getValue());
+      assertEquals("Woof-Woof", e.getActual().getValue());
+      assertTrue(e.getMessage().contains("Page title expected to be"), e.getMessage());
+    }
   }
 
   @Test
@@ -113,12 +113,14 @@ public class TestPageAssertions extends TestBase {
   @Test
   void hasTitleRegexFail() {
     page.navigate(server.PREFIX + "/title.html");
-    AssertionFailedError e = assertThrows(AssertionFailedError.class, () -> {
+    try {
       assertThat(page).hasTitle(Pattern.compile("^foo[AB]"), new PageAssertions.HasTitleOptions().setTimeout(1_000));
-    });
-    assertEquals("^foo[AB]", e.getExpected().getStringRepresentation());
-    assertEquals("Woof-Woof", e.getActual().getValue());
-    assertTrue(e.getMessage().contains("Page title expected to match regex: ^foo[AB]\nReceived: Woof-Woof"), e.getMessage());
+      fail("did not throw");
+    } catch (AssertionFailedError e) {
+      assertEquals("^foo[AB]", e.getExpected().getStringRepresentation());
+      assertEquals("Woof-Woof", e.getActual().getValue());
+      assertTrue(e.getMessage().contains("Page title expected to match regex"), e.getMessage());
+    }
   }
 
   @Test

driver-bundle/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.microsoft.playwright</groupId>
     <artifactId>parent-pom</artifactId>
-    <version>1.35.1</version>
+    <version>1.17.0</version>
   </parent>
 
   <artifactId>driver-bundle</artifactId>
@@ -16,6 +16,25 @@
     It is intended to be used on the systems where Playwright driver is not preinstalled.
   </description>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+        <configuration>
+          <excludeResources>true</excludeResources>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
   <dependencies>
     <dependency>
       <groupId>com.microsoft.playwright</groupId>

driver-bundle/src/main/java/com/microsoft/playwright/impl/DriverJar.java

@@ -14,9 +14,7 @@
  * limitations under the License.
  */
 
-package com.microsoft.playwright.impl.driver.jar;
-
-import com.microsoft.playwright.impl.driver.Driver;
+package com.microsoft.playwright.impl;
 
 import java.io.IOException;
 import java.net.URI;
@@ -28,45 +26,17 @@ import java.util.concurrent.TimeUnit;
 
 public class DriverJar extends Driver {
   private static final String PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = "PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD";
-  private static final String SELENIUM_REMOTE_URL = "SELENIUM_REMOTE_URL";
-  static final String PLAYWRIGHT_NODEJS_PATH = "PLAYWRIGHT_NODEJS_PATH";
   private final Path driverTempDir;
-  private Path preinstalledNodePath;
 
-  public DriverJar() throws IOException {
-    // Allow specifying custom path for the driver installation
-    // See https://github.com/microsoft/playwright-java/issues/728
-    String alternativeTmpdir = System.getProperty("playwright.driver.tmpdir");
-    String prefix = "playwright-java-";
-    driverTempDir = alternativeTmpdir == null
-      ? Files.createTempDirectory(prefix)
-      : Files.createTempDirectory(Paths.get(alternativeTmpdir), prefix);
+  DriverJar() throws IOException, URISyntaxException, InterruptedException {
+    driverTempDir = Files.createTempDirectory("playwright-java-");
     driverTempDir.toFile().deleteOnExit();
-    String nodePath = System.getProperty("playwright.nodejs.path");
-    if (nodePath != null) {
-      preinstalledNodePath = Paths.get(nodePath);
-      if (!Files.exists(preinstalledNodePath)) {
-        throw new RuntimeException("Invalid Node.js path specified: " + nodePath);
-      }
-    }
-    logMessage("created DriverJar: " + driverTempDir);
   }
 
   @Override
-  protected void initialize(Boolean installBrowsers) throws Exception {
-    if (preinstalledNodePath == null && env.containsKey(PLAYWRIGHT_NODEJS_PATH)) {
-      preinstalledNodePath = Paths.get(env.get(PLAYWRIGHT_NODEJS_PATH));
-      if (!Files.exists(preinstalledNodePath)) {
-        throw new RuntimeException("Invalid Node.js path specified: " + preinstalledNodePath);
-      }
-    } else if (preinstalledNodePath != null) {
-      // Pass the env variable to the driver process.
-      env.put(PLAYWRIGHT_NODEJS_PATH, preinstalledNodePath.toString());
-    }
+  protected void initialize(Map<String, String> env) throws Exception {
     extractDriverToTempDir();
-    logMessage("extracted driver from jar to " + driverPath());
-    if (installBrowsers)
-      installBrowsers(env);
+    installBrowsers(env);
   }
 
   private void installBrowsers(Map<String, String> env) throws IOException, InterruptedException {
@@ -78,16 +48,13 @@ public class DriverJar extends Driver {
       System.out.println("Skipping browsers download because `PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD` env variable is set");
       return;
     }
-    if (env.get(SELENIUM_REMOTE_URL) != null || System.getenv(SELENIUM_REMOTE_URL) != null) {
-      logMessage("Skipping browsers download because `SELENIUM_REMOTE_URL` env variable is set");
-      return;
-    }
-    Path driver = driverPath();
+    String cliFileName = super.cliFileName();
+    Path driver = driverTempDir.resolve(cliFileName);
     if (!Files.exists(driver)) {
-      throw new RuntimeException("Failed to find driver: " + driver);
+      throw new RuntimeException("Failed to find " + cliFileName + " at " + driver);
     }
-    ProcessBuilder pb = createProcessBuilder();
-    pb.command().add("install");
+    ProcessBuilder pb = new ProcessBuilder(driver.toString(), "install");
+    pb.environment().putAll(env);
     pb.redirectError(ProcessBuilder.Redirect.INHERIT);
     pb.redirectOutput(ProcessBuilder.Redirect.INHERIT);
     Process p = pb.start();
@@ -106,25 +73,13 @@ public class DriverJar extends Driver {
     return name.endsWith(".sh") || name.endsWith(".exe") || !name.contains(".");
   }
 
-  private FileSystem initFileSystem(URI uri) throws IOException {
-    try {
-      return FileSystems.newFileSystem(uri, Collections.emptyMap());
-    } catch (FileSystemAlreadyExistsException e) {
-      return null;
-    }
-  }
-
-  public static URI getDriverResourceURI() throws URISyntaxException {
+  private void extractDriverToTempDir() throws URISyntaxException, IOException {
     ClassLoader classloader = Thread.currentThread().getContextClassLoader();
-    return classloader.getResource("driver/" + platformDir()).toURI();
-  }
-
-  void extractDriverToTempDir() throws URISyntaxException, IOException {
-    URI originalUri = getDriverResourceURI();
+    URI originalUri = classloader.getResource("driver/" + platformDir()).toURI();
     URI uri = maybeExtractNestedJar(originalUri);
 
     // Create zip filesystem if loading from jar.
-    try (FileSystem fileSystem = "jar".equals(uri.getScheme()) ? initFileSystem(uri) : null) {
+    try (FileSystem fileSystem = "jar".equals(uri.getScheme()) ? FileSystems.newFileSystem(uri, Collections.emptyMap()) : null) {
       Path srcRoot = Paths.get(uri);
       // jar file system's .relativize gives wrong results when used with
       // spring-boot-maven-plugin, convert to the default filesystem to
@@ -132,12 +87,6 @@ public class DriverJar extends Driver {
       // See https://github.com/microsoft/playwright-java/issues/306
       Path srcRootDefaultFs = Paths.get(srcRoot.toString());
       Files.walk(srcRoot).forEach(fromPath -> {
-        if (preinstalledNodePath != null) {
-          String fileName = fromPath.getFileName().toString();
-          if ("node.exe".equals(fileName) || "node".equals(fileName)) {
-            return;
-          }
-        }
         Path relative = srcRootDefaultFs.relativize(Paths.get(fromPath.toString()));
         Path toPath = driverTempDir.resolve(relative.toString());
         try {
@@ -181,30 +130,20 @@ public class DriverJar extends Driver {
 
   private static String platformDir() {
     String name = System.getProperty("os.name").toLowerCase();
-    String arch = System.getProperty("os.arch").toLowerCase();
-
     if (name.contains("windows")) {
       return "win32_x64";
     }
     if (name.contains("linux")) {
-      if (arch.equals("aarch64")) {
-        return "linux-arm64";
-      } else {
-        return "linux";
-      }
+      return "linux";
     }
     if (name.contains("mac os x")) {
-      if (arch.equals("aarch64")) {
-        return "mac-arm64";
-      } else {
-        return "mac";
-      }
+      return "mac";
     }
     throw new RuntimeException("Unexpected os.name value: " + name);
   }
 
   @Override
-  protected Path driverDir() {
+  Path driverDir() {
     return driverTempDir;
   }
 }

driver-bundle/src/test/java/com/microsoft/playwright/TestInstall.java

@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright;
+
+import com.microsoft.playwright.impl.Driver;
+import org.junit.jupiter.api.Test;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.concurrent.TimeUnit;
+
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class TestInstall {
+  @Test
+  void playwrightCliInstalled() throws Exception {
+    // Clear system property to ensure that the driver is loaded from jar.
+    System.clearProperty("playwright.cli.dir");
+    Path cli = Driver.ensureDriverInstalled(Collections.emptyMap());
+    assertTrue(Files.exists(cli));
+
+    ProcessBuilder pb = new ProcessBuilder(cli.toString(), "install");
+    pb.redirectError(ProcessBuilder.Redirect.INHERIT);
+    pb.redirectOutput(ProcessBuilder.Redirect.INHERIT);
+    Process p = pb.start();
+    boolean result = p.waitFor(1, TimeUnit.MINUTES);
+    assertTrue(result, "Timed out waiting for browsers to install");
+  }
+}

driver-bundle/src/test/java/com/microsoft/playwright/impl/driver/jar/TestInstall.java

@@ -1,164 +0,0 @@
-/*
- * Copyright (c) Microsoft Corporation.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.microsoft.playwright.impl.driver.jar;
-
-import com.microsoft.playwright.impl.driver.Driver;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.io.TempDir;
-
-import java.io.IOException;
-import java.net.ServerSocket;
-import java.net.URISyntaxException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-import static com.microsoft.playwright.impl.driver.jar.DriverJar.PLAYWRIGHT_NODEJS_PATH;
-import static java.util.Collections.singletonMap;
-import static org.junit.jupiter.api.Assertions.*;
-
-public class TestInstall {
-  private static boolean isPortAvailable(int port) {
-    try (ServerSocket ignored = new ServerSocket(port)) {
-      return true;
-    } catch (IOException ignored) {
-      return false;
-    }
-  }
-
-  private static int unusedPort() {
-    for (int i = 10000; i < 11000; i++) {
-      if (isPortAvailable(i)) {
-        return i;
-      }
-    }
-    throw new RuntimeException("Cannot find unused local port");
-  }
-
-  @BeforeEach
-  void clearSystemProperties() {
-    // Clear system property to ensure that the driver is loaded from jar.
-    System.clearProperty("playwright.cli.dir");
-    System.clearProperty("playwright.driver.tmpdir");
-    System.clearProperty("playwright.nodejs.path");
-    // Clear system property to ensure that the default driver is loaded.
-    System.clearProperty("playwright.driver.impl");
-  }
-
-  @Test
-  void shouldThrowWhenBrowserPathIsInvalid(@TempDir Path tmpDir) throws NoSuchFieldException, IllegalAccessException {
-    Map<String,String> env = new HashMap<>();
-
-    // On macOS we can only use 127.0.0.1, so pick unused port instead.
-    // https://superuser.com/questions/458875/how-do-you-get-loopback-addresses-other-than-127-0-0-1-to-work-on-os-x
-    env.put("PLAYWRIGHT_DOWNLOAD_HOST", "https://127.0.0.1:" + unusedPort());
-    // Make sure the browsers are not installed yet by pointing at an empty dir.
-    env.put("PLAYWRIGHT_BROWSERS_PATH", tmpDir.toString());
-    env.put("PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD", "false");
-
-    RuntimeException exception = assertThrows(RuntimeException.class, () -> Driver.createAndInstall(env, true));
-    String message = exception.getMessage();
-    assertTrue(message.contains("Failed to create driver"), message);
-  }
-
-  @Test
-  void playwrightCliInstalled() throws Exception {
-    Driver driver = Driver.createAndInstall(Collections.emptyMap(), false);
-    assertTrue(Files.exists(driver.driverPath()));
-
-    ProcessBuilder pb = driver.createProcessBuilder();
-    pb.command().add("install");
-    pb.redirectError(ProcessBuilder.Redirect.INHERIT);
-    pb.redirectOutput(ProcessBuilder.Redirect.INHERIT);
-    Process p = pb.start();
-    boolean result = p.waitFor(1, TimeUnit.MINUTES);
-    assertTrue(result, "Timed out waiting for browsers to install");
-  }
-
-  @Test
-  void playwrightDriverInAlternativeTmpdir(@TempDir Path tmpdir) throws Exception {
-    System.setProperty("playwright.driver.tmpdir", tmpdir.toString());
-    DriverJar driver = new DriverJar();
-    assertTrue(driver.driverPath().startsWith(tmpdir), "Driver path: " + driver.driverPath() + " tmp: " + tmpdir);
-  }
-
-  @Test
-  void playwrightDriverDefaultImpl() {
-    assertDoesNotThrow(() -> Driver.createAndInstall(Collections.emptyMap(), false));
-  }
-
-  @Test
-  void playwrightDriverAlternativeImpl() throws NoSuchFieldException, IllegalAccessException {
-    System.setProperty("playwright.driver.impl", "com.microsoft.playwright.impl.AlternativeDriver");
-    RuntimeException thrown =
-      assertThrows(
-        RuntimeException.class,
-        () -> Driver.createAndInstall(Collections.emptyMap(), false));
-    assertEquals("Failed to create driver", thrown.getMessage());
-  }
-
-  @Test
-  void canPassPreinstalledNodeJsAsSystemProperty(@TempDir Path tmpDir) throws IOException, URISyntaxException, InterruptedException {
-    String nodePath = extractNodeJsToTemp();
-    System.setProperty("playwright.nodejs.path", nodePath);
-    Driver driver = Driver.createAndInstall(Collections.emptyMap(), false);
-    canSpecifyPreinstalledNodeJsShared(driver, tmpDir);
-  }
-
-  @Test
-  void canSpecifyPreinstalledNodeJsAsEnv(@TempDir Path tmpDir) throws IOException, URISyntaxException, InterruptedException {
-    String nodePath = extractNodeJsToTemp();
-    Driver driver = Driver.createAndInstall(singletonMap(PLAYWRIGHT_NODEJS_PATH, nodePath), false);
-    canSpecifyPreinstalledNodeJsShared(driver, tmpDir);
-  }
-
-
-  private static String extractNodeJsToTemp() throws URISyntaxException, IOException {
-    DriverJar auxDriver = new DriverJar();
-    auxDriver.extractDriverToTempDir();
-    String nodePath = auxDriver.driverPath().getParent().resolve(isWindows() ? "node.exe" : "node").toString();
-    return nodePath;
-  }
-
-  private static boolean isWindows() {
-    String name = System.getProperty("os.name").toLowerCase();
-    return name.contains("win");
-  }
-
-  private static void canSpecifyPreinstalledNodeJsShared(Driver driver, Path tmpDir) throws IOException, URISyntaxException, InterruptedException {
-    Path builtinNode = driver.driverPath().getParent().resolve("node");
-    assertFalse(Files.exists(builtinNode), builtinNode.toString());
-    Path builtinNodeExe = driver.driverPath().getParent().resolve("node.exe");
-    assertFalse(Files.exists(builtinNodeExe), builtinNodeExe.toString());
-
-    ProcessBuilder pb = driver.createProcessBuilder();
-    pb.command().add("--version");
-    pb.redirectError(ProcessBuilder.Redirect.INHERIT);
-    Path out = tmpDir.resolve("out.txt");
-    pb.redirectOutput(out.toFile());
-    Process p = pb.start();
-    boolean result = p.waitFor(1, TimeUnit.MINUTES);
-    assertTrue(result, "Timed out waiting for version to be printed");
-    String stdout = new String(Files.readAllBytes(out), StandardCharsets.UTF_8);
-    assertTrue(stdout.contains("Version "), stdout);
-  }
-}

driver/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.microsoft.playwright</groupId>
     <artifactId>parent-pom</artifactId>
-    <version>1.35.1</version>
+    <version>1.17.0</version>
   </parent>
 
   <artifactId>driver</artifactId>
@@ -15,6 +15,22 @@
     This module provides API for discovery and launching of Playwright driver.
   </description>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
   <dependencies>
     <dependency>
       <groupId>org.junit.jupiter</groupId>

driver/src/main/java/com/microsoft/playwright/impl/Driver.java

@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright.impl;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Map;
+
+/**
+ * This class provides access to playwright-cli. It can be either preinstalled
+ * in the host system and its path is passed as a system property or it can be
+ * loaded from the driver-bundle module if that module is in the classpath.
+ */
+public abstract class Driver {
+  private static Driver instance;
+
+  private static class PreinstalledDriver extends Driver {
+    private final Path driverDir;
+    PreinstalledDriver(Path driverDir) {
+      this.driverDir = driverDir;
+    }
+
+    @Override
+    protected void initialize(Map<String, String> env) {
+      // no-op
+    }
+
+    @Override
+    Path driverDir() {
+      return driverDir;
+    }
+  }
+
+  public static synchronized Path ensureDriverInstalled(Map<String, String> env) {
+    if (instance == null) {
+      try {
+        instance = createDriver();
+        instance.initialize(env);
+      } catch (Exception exception) {
+        throw new RuntimeException("Failed to create driver", exception);
+      }
+    }
+    String name = instance.cliFileName();
+    return instance.driverDir().resolve(name);
+  }
+
+  protected abstract void initialize(Map<String, String> env) throws Exception;
+
+  protected String cliFileName() {
+    return System.getProperty("os.name").toLowerCase().contains("windows") ?
+      "playwright.cmd" : "playwright.sh";
+  }
+
+  private static Driver createDriver() throws Exception {
+    String pathFromProperty = System.getProperty("playwright.cli.dir");
+    if (pathFromProperty != null) {
+      return new PreinstalledDriver(Paths.get(pathFromProperty));
+    }
+
+    Class<?> jarDriver = Class.forName("com.microsoft.playwright.impl.DriverJar");
+    return (Driver) jarDriver.getDeclaredConstructor().newInstance();
+  }
+
+  abstract Path driverDir();
+}

driver/src/main/java/com/microsoft/playwright/impl/driver/Driver.java

@@ -1,127 +0,0 @@
-/*
- * Copyright (c) Microsoft Corporation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.microsoft.playwright.impl.driver;
-
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import static com.microsoft.playwright.impl.driver.DriverLogging.logWithTimestamp;
-
-/**
- * This class provides access to playwright-cli. It can be either preinstalled
- * in the host system and its path is passed as a system property or it can be
- * loaded from the driver-bundle module if that module is in the classpath.
- */
-public abstract class Driver {
-  protected final Map<String, String> env = new LinkedHashMap<>();
-
-  private static Driver instance;
-
-  private static class PreinstalledDriver extends Driver {
-    private final Path driverDir;
-    PreinstalledDriver(Path driverDir) {
-      logMessage("created PreinstalledDriver: " + driverDir);
-      this.driverDir = driverDir;
-    }
-
-    @Override
-    protected void initialize(Boolean installBrowsers) {
-      // no-op
-    }
-
-    @Override
-    protected Path driverDir() {
-      return driverDir;
-    }
-  }
-
-  public static synchronized Driver ensureDriverInstalled(Map<String, String> env, Boolean installBrowsers) {
-    if (instance == null) {
-      instance = createAndInstall(env, installBrowsers);
-    }
-    return instance;
-  }
-
-  private void initialize(Map<String, String> env, Boolean installBrowsers) throws Exception {
-    this.env.putAll(env);
-    initialize(installBrowsers);
-  }
-  protected abstract void initialize(Boolean installBrowsers) throws Exception;
-
-  public Path driverPath() {
-    String cliFileName = System.getProperty("os.name").toLowerCase().contains("windows") ?
-      "playwright.cmd" : "playwright.sh";
-    return driverDir().resolve(cliFileName);
-  }
-
-  public ProcessBuilder createProcessBuilder() {
-    ProcessBuilder pb = new ProcessBuilder(driverPath().toString());
-    pb.environment().putAll(env);
-    pb.environment().put("PW_LANG_NAME", "java");
-    pb.environment().put("PW_LANG_NAME_VERSION", getMajorJavaVersion());
-    String version = Driver.class.getPackage().getImplementationVersion();
-    if (version != null) {
-      pb.environment().put("PW_CLI_DISPLAY_VERSION", version);
-    }
-    return pb;
-  }
-
-  private static String getMajorJavaVersion() {
-    String version = System.getProperty("java.version");
-    if (version.startsWith("1.")) {
-      return version.substring(2, 3);
-    }
-    int dot = version.indexOf(".");
-    if (dot != -1) {
-      return version.substring(0, dot);
-    }
-    return version;
-  }
-  public static Driver createAndInstall(Map<String, String> env, Boolean installBrowsers) {
-    try {
-      Driver instance = newInstance();
-      logMessage("initializing driver");
-      instance.initialize(env, installBrowsers);
-      logMessage("driver initialized.");
-      return instance;
-    } catch (Exception exception) {
-      throw new RuntimeException("Failed to create driver", exception);
-    }
-  }
-
-  private static Driver newInstance() throws Exception {
-    String pathFromProperty = System.getProperty("playwright.cli.dir");
-    if (pathFromProperty != null) {
-      return new PreinstalledDriver(Paths.get(pathFromProperty));
-    }
-
-    String driverImpl =
-      System.getProperty("playwright.driver.impl", "com.microsoft.playwright.impl.driver.jar.DriverJar");
-    Class<?> jarDriver = Class.forName(driverImpl);
-    return (Driver) jarDriver.getDeclaredConstructor().newInstance();
-  }
-
-  protected abstract Path driverDir();
-
-  protected static void logMessage(String message) {
-    // This matches log format produced by the server.
-    logWithTimestamp("pw:install " + message);
-  }
-}

driver/src/main/java/com/microsoft/playwright/impl/driver/DriverLogging.java

@@ -1,41 +0,0 @@
-/*
- * Copyright (c) Microsoft Corporation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.microsoft.playwright.impl.driver;
-
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
-
-class DriverLogging {
-  private static final boolean isEnabled;
-  static {
-    String debug = System.getenv("DEBUG");
-    isEnabled = (debug != null) && debug.contains("pw:install");
-  }
-
-  private static final DateTimeFormatter timestampFormat = DateTimeFormatter.ofPattern(
-    "yyyy-MM-dd'T'HH:mm:ss.SSSXXX").withZone(ZoneId.of("UTC"));
-
-  static void logWithTimestamp(String message) {
-    if (!isEnabled) {
-      return;
-    }
-    // This matches log format produced by the server.
-    String timestamp = ZonedDateTime.now().format(timestampFormat);
-    System.err.println(timestamp + " " + message);
-  }
-}

examples/pom.xml

@@ -6,7 +6,7 @@
 
   <groupId>org.example</groupId>
   <artifactId>examples</artifactId>
-  <version>1.35.1</version>
+  <version>1.17.0</version>
   <name>Playwright Client Examples</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>com.microsoft.playwright</groupId>
       <artifactId>playwright</artifactId>
-      <version>1.30.0</version>
+      <version>1.16.0</version>
     </dependency>
   </dependencies>
   <build>

examples/src/main/java/org/example/PageScreenshot.java

@@ -34,7 +34,7 @@ public class PageScreenshot {
         try (Browser browser = browserType.launch()) {
           BrowserContext context = browser.newContext();
           Page page = context.newPage();
-          page.navigate("https://playwright.dev/");
+          page.navigate("http://whatsmyuseragent.org/");
           page.screenshot(new Page.ScreenshotOptions().setPath(Paths.get("screenshot-" + browserType.name() + ".png")));
         }
       }

examples/src/main/java/org/example/SelectorsAndKeyboardManipulation.java

@@ -1,36 +0,0 @@
-/*
- * Copyright (c) Microsoft Corporation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.example;
-
-import java.nio.file.Paths;
-import com.microsoft.playwright.*;
-
-public class SelectorsAndKeyboardManipulation {
-  public static void main(String[] args) {
-    try(Playwright playwright = Playwright.create()) {
-      Browser browser = playwright.firefox().launch();
-      BrowserContext context = browser.newContext();
-      Page page = context.newPage();
-      page.navigate("https://playwright.dev/java/");
-      page.locator("text=SearchK").click();
-      page.locator("[placeholder=\"Search docs\"]").fill("getting started");
-      page.locator("div[role=\"button\"]:has-text(\"CancelIntroductionGetting startedInstallation​Getting startedUsage​Getting start\")").click();
-      page.waitForSelector("h1:has-text(\"Getting started\")"); // Waits for the new page to load before screenshotting.
-      page.screenshot(new Page.ScreenshotOptions().setPath(Paths.get("Screenshot.png")));
-    }
-  }
-}

examples/src/main/java/org/example/WebKitScreenshot.java

@@ -24,7 +24,7 @@ public class WebKitScreenshot {
     try (Playwright playwright = Playwright.create()) {
       Browser browser = playwright.webkit().launch();
       Page page = browser.newPage();
-      page.navigate("https://playwright.dev/");
+      page.navigate("http://whatsmyuseragent.org/");
       page.screenshot(new Page.ScreenshotOptions().setPath(Paths.get("example.png")));
     }
   }

jbang-catalog.json

@@ -0,0 +1,10 @@
+{
+  "catalogs": {},
+  "aliases": {
+    "playwright": {
+      "script-ref": "scripts/playwright.java",
+      "description": "Playwright lets you automate Chromium, Firefox and Webkit with a single API. \nWith this cli you can install, trace, generate pdf and screenshots and more.\nExample on how to record and run a script:\n```\n  jbang playwright@microsoft/playwright-java codegen -o Example.java`\n  jbang --deps com.microsoft.playwright:playwright:RELEASE Example.java\n```"
+    }
+  },
+  "templates": {}
+}

playwright/pom.xml

@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.microsoft.playwright</groupId>
     <artifactId>parent-pom</artifactId>
-    <version>1.35.1</version>
+    <version>1.17.0</version>
   </parent>
 
   <artifactId>playwright</artifactId>
@@ -21,17 +21,30 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <configuration combine.self="append">
+        <configuration>
           <subpackages>com.microsoft.playwright</subpackages>
           <excludePackageNames>com.microsoft.playwright.impl</excludePackageNames>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
+        <version>2.4</version>
         <executions>
           <execution>
             <goals>
@@ -61,10 +74,6 @@
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.opentest4j</groupId>
-      <artifactId>opentest4j</artifactId>
-    </dependency>
     <dependency>
       <groupId>com.microsoft.playwright</groupId>
       <artifactId>driver</artifactId>

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

@@ -1,195 +0,0 @@
-/*
- * Copyright (c) Microsoft Corporation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.microsoft.playwright;
-
-import com.microsoft.playwright.options.*;
-import java.nio.file.Path;
-import java.util.*;
-
-/**
- * Exposes API that can be used for the Web API testing. This class is used for creating {@code APIRequestContext} instance
- * which in turn can be used for sending web requests. An instance of this class can be obtained via {@link
- * Playwright#request Playwright.request()}. For more information see {@code APIRequestContext}.
- */
-public interface APIRequest {
-  class NewContextOptions {
-    /**
-     * Methods like {@link APIRequestContext#get APIRequestContext.get()} take the base URL into consideration by using the <a
-     * href="https://developer.mozilla.org/en-US/docs/Web/API/URL/URL">{@code URL()}</a> constructor for building the
-     * corresponding URL. Examples:
-     * <ul>
-     * <li> baseURL: {@code http://localhost:3000} and sending request to {@code /bar.html} results in {@code
-     * http://localhost:3000/bar.html}</li>
-     * <li> baseURL: {@code http://localhost:3000/foo/} and sending request to {@code ./bar.html} results in {@code
-     * http://localhost:3000/foo/bar.html}</li>
-     * <li> baseURL: {@code http://localhost:3000/foo} (without trailing slash) and navigating to {@code ./bar.html} results in
-     * {@code http://localhost:3000/bar.html}</li>
-     * </ul>
-     */
-    public String baseURL;
-    /**
-     * An object containing additional HTTP headers to be sent with every request. Defaults to none.
-     */
-    public Map<String, String> extraHTTPHeaders;
-    /**
-     * Credentials for <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication">HTTP authentication</a>. If
-     * no origin is specified, the username and password are sent to any servers upon unauthorized responses.
-     */
-    public HttpCredentials httpCredentials;
-    /**
-     * Whether to ignore HTTPS errors when sending network requests. Defaults to {@code false}.
-     */
-    public Boolean ignoreHTTPSErrors;
-    /**
-     * Network proxy settings.
-     */
-    public Proxy proxy;
-    /**
-     * Populates context with given storage state. This option can be used to initialize context with logged-in information
-     * obtained via {@link BrowserContext#storageState BrowserContext.storageState()} or {@link APIRequestContext#storageState
-     * APIRequestContext.storageState()}. Either a path to the file with saved storage, or the value returned by one of {@link
-     * BrowserContext#storageState BrowserContext.storageState()} or {@link APIRequestContext#storageState
-     * APIRequestContext.storageState()} methods.
-     */
-    public String storageState;
-    /**
-     * Populates context with given storage state. This option can be used to initialize context with logged-in information
-     * obtained via {@link BrowserContext#storageState BrowserContext.storageState()}. Path to the file with saved storage
-     * state.
-     */
-    public Path storageStatePath;
-    /**
-     * Maximum time in milliseconds to wait for the response. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable
-     * timeout.
-     */
-    public Double timeout;
-    /**
-     * Specific user agent to use in this context.
-     */
-    public String userAgent;
-
-    /**
-     * Methods like {@link APIRequestContext#get APIRequestContext.get()} take the base URL into consideration by using the <a
-     * href="https://developer.mozilla.org/en-US/docs/Web/API/URL/URL">{@code URL()}</a> constructor for building the
-     * corresponding URL. Examples:
-     * <ul>
-     * <li> baseURL: {@code http://localhost:3000} and sending request to {@code /bar.html} results in {@code
-     * http://localhost:3000/bar.html}</li>
-     * <li> baseURL: {@code http://localhost:3000/foo/} and sending request to {@code ./bar.html} results in {@code
-     * http://localhost:3000/foo/bar.html}</li>
-     * <li> baseURL: {@code http://localhost:3000/foo} (without trailing slash) and navigating to {@code ./bar.html} results in
-     * {@code http://localhost:3000/bar.html}</li>
-     * </ul>
-     */
-    public NewContextOptions setBaseURL(String baseURL) {
-      this.baseURL = baseURL;
-      return this;
-    }
-    /**
-     * An object containing additional HTTP headers to be sent with every request. Defaults to none.
-     */
-    public NewContextOptions setExtraHTTPHeaders(Map<String, String> extraHTTPHeaders) {
-      this.extraHTTPHeaders = extraHTTPHeaders;
-      return this;
-    }
-    /**
-     * Credentials for <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication">HTTP authentication</a>. If
-     * no origin is specified, the username and password are sent to any servers upon unauthorized responses.
-     */
-    public NewContextOptions setHttpCredentials(String username, String password) {
-      return setHttpCredentials(new HttpCredentials(username, password));
-    }
-    /**
-     * Credentials for <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication">HTTP authentication</a>. If
-     * no origin is specified, the username and password are sent to any servers upon unauthorized responses.
-     */
-    public NewContextOptions setHttpCredentials(HttpCredentials httpCredentials) {
-      this.httpCredentials = httpCredentials;
-      return this;
-    }
-    /**
-     * Whether to ignore HTTPS errors when sending network requests. Defaults to {@code false}.
-     */
-    public NewContextOptions setIgnoreHTTPSErrors(boolean ignoreHTTPSErrors) {
-      this.ignoreHTTPSErrors = ignoreHTTPSErrors;
-      return this;
-    }
-    /**
-     * Network proxy settings.
-     */
-    public NewContextOptions setProxy(String server) {
-      return setProxy(new Proxy(server));
-    }
-    /**
-     * Network proxy settings.
-     */
-    public NewContextOptions setProxy(Proxy proxy) {
-      this.proxy = proxy;
-      return this;
-    }
-    /**
-     * Populates context with given storage state. This option can be used to initialize context with logged-in information
-     * obtained via {@link BrowserContext#storageState BrowserContext.storageState()} or {@link APIRequestContext#storageState
-     * APIRequestContext.storageState()}. Either a path to the file with saved storage, or the value returned by one of {@link
-     * BrowserContext#storageState BrowserContext.storageState()} or {@link APIRequestContext#storageState
-     * APIRequestContext.storageState()} methods.
-     */
-    public NewContextOptions setStorageState(String storageState) {
-      this.storageState = storageState;
-      return this;
-    }
-    /**
-     * Populates context with given storage state. This option can be used to initialize context with logged-in information
-     * obtained via {@link BrowserContext#storageState BrowserContext.storageState()}. Path to the file with saved storage
-     * state.
-     */
-    public NewContextOptions setStorageStatePath(Path storageStatePath) {
-      this.storageStatePath = storageStatePath;
-      return this;
-    }
-    /**
-     * Maximum time in milliseconds to wait for the response. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable
-     * timeout.
-     */
-    public NewContextOptions setTimeout(double timeout) {
-      this.timeout = timeout;
-      return this;
-    }
-    /**
-     * Specific user agent to use in this context.
-     */
-    public NewContextOptions setUserAgent(String userAgent) {
-      this.userAgent = userAgent;
-      return this;
-    }
-  }
-  /**
-   * Creates new instances of {@code APIRequestContext}.
-   *
-   * @since v1.16
-   */
-  default APIRequestContext newContext() {
-    return newContext(null);
-  }
-  /**
-   * Creates new instances of {@code APIRequestContext}.
-   *
-   * @since v1.16
-   */
-  APIRequestContext newContext(NewContextOptions options);
-}
-

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

@@ -1,443 +0,0 @@
-/*
- * Copyright (c) Microsoft Corporation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.microsoft.playwright;
-
-import com.microsoft.playwright.options.*;
-import java.nio.file.Path;
-
-/**
- * This API is used for the Web API testing. You can use it to trigger API endpoints, configure micro-services, prepare
- * environment or the service to your e2e test.
- *
- * <p> Each Playwright browser context has associated with it {@code APIRequestContext} instance which shares cookie storage
- * with the browser context and can be accessed via {@link BrowserContext#request BrowserContext.request()} or {@link
- * Page#request Page.request()}. It is also possible to create a new APIRequestContext instance manually by calling {@link
- * APIRequest#newContext APIRequest.newContext()}.
- *
- * <p> **Cookie management**
- *
- * <p> {@code APIRequestContext} returned by {@link BrowserContext#request BrowserContext.request()} and {@link Page#request
- * Page.request()} shares cookie storage with the corresponding {@code BrowserContext}. Each API request will have {@code
- * Cookie} header populated with the values from the browser context. If the API response contains {@code Set-Cookie}
- * header it will automatically update {@code BrowserContext} cookies and requests made from the page will pick them up.
- * This means that if you log in using this API, your e2e test will be logged in and vice versa.
- *
- * <p> If you want API requests to not interfere with the browser cookies you should create a new {@code APIRequestContext} by
- * calling {@link APIRequest#newContext APIRequest.newContext()}. Such {@code APIRequestContext} object will have its own
- * isolated cookie storage.
- */
-public interface APIRequestContext {
-  class StorageStateOptions {
-    /**
-     * The file path to save the storage state to. If {@code path} is a relative path, then it is resolved relative to current
-     * working directory. If no path is provided, storage state is still returned, but won't be saved to the disk.
-     */
-    public Path path;
-
-    /**
-     * The file path to save the storage state to. If {@code path} is a relative path, then it is resolved relative to current
-     * working directory. If no path is provided, storage state is still returned, but won't be saved to the disk.
-     */
-    public StorageStateOptions setPath(Path path) {
-      this.path = path;
-      return this;
-    }
-  }
-  /**
-   * Sends HTTP(S) <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/DELETE">DELETE</a> request and returns
-   * its response. The method will populate request cookies from the context and update context cookies from the response.
-   * The method will automatically follow redirects.
-   *
-   * @param url Target URL.
-   * @since v1.16
-   */
-  default APIResponse delete(String url) {
-    return delete(url, null);
-  }
-  /**
-   * Sends HTTP(S) <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/DELETE">DELETE</a> request and returns
-   * its response. The method will populate request cookies from the context and update context cookies from the response.
-   * The method will automatically follow redirects.
-   *
-   * @param url Target URL.
-   * @param params Optional request parameters.
-   * @since v1.16
-   */
-  APIResponse delete(String url, RequestOptions params);
-  /**
-   * All responses returned by {@link APIRequestContext#get APIRequestContext.get()} and similar methods are stored in the
-   * memory, so that you can later call {@link APIResponse#body APIResponse.body()}. This method discards all stored
-   * responses, and makes {@link APIResponse#body APIResponse.body()} throw "Response disposed" error.
-   *
-   * @since v1.16
-   */
-  void dispose();
-  /**
-   * Sends HTTP(S) request and returns its response. The method will populate request cookies from the context and update
-   * context cookies from the response. The method will automatically follow redirects. JSON objects can be passed directly
-   * to the request.
-   *
-   * <p> **Usage**
-   * <pre>{@code
-   * Map<String, Object> data = new HashMap();
-   * data.put("title", "Book Title");
-   * data.put("body", "John Doe");
-   * request.fetch("https://example.com/api/createBook", RequestOptions.create().setMethod("post").setData(data));
-   * }</pre>
-   *
-   * <p> The common way to send file(s) in the body of a request is to encode it as form fields with {@code multipart/form-data}
-   * encoding. You can achieve that with Playwright API like this:
-   * <pre>{@code
-   * // Pass file path to the form data constructor:
-   * Path file = Paths.get("team.csv");
-   * APIResponse response = request.fetch("https://example.com/api/uploadTeamList",
-   *   RequestOptions.create().setMethod("post").setMultipart(
-   *     FormData.create().set("fileField", file)));
-   *
-   * // Or you can pass the file content directly as FilePayload object:
-   * FilePayload filePayload = new FilePayload("f.js", "text/javascript",
-   *       "console.log(2022);".getBytes(StandardCharsets.UTF_8));
-   * APIResponse response = request.fetch("https://example.com/api/uploadTeamList",
-   *   RequestOptions.create().setMethod("post").setMultipart(
-   *     FormData.create().set("fileField", filePayload)));
-   * }</pre>
-   *
-   * @param urlOrRequest Target URL or Request to get all parameters from.
-   * @since v1.16
-   */
-  default APIResponse fetch(String urlOrRequest) {
-    return fetch(urlOrRequest, null);
-  }
-  /**
-   * Sends HTTP(S) request and returns its response. The method will populate request cookies from the context and update
-   * context cookies from the response. The method will automatically follow redirects. JSON objects can be passed directly
-   * to the request.
-   *
-   * <p> **Usage**
-   * <pre>{@code
-   * Map<String, Object> data = new HashMap();
-   * data.put("title", "Book Title");
-   * data.put("body", "John Doe");
-   * request.fetch("https://example.com/api/createBook", RequestOptions.create().setMethod("post").setData(data));
-   * }</pre>
-   *
-   * <p> The common way to send file(s) in the body of a request is to encode it as form fields with {@code multipart/form-data}
-   * encoding. You can achieve that with Playwright API like this:
-   * <pre>{@code
-   * // Pass file path to the form data constructor:
-   * Path file = Paths.get("team.csv");
-   * APIResponse response = request.fetch("https://example.com/api/uploadTeamList",
-   *   RequestOptions.create().setMethod("post").setMultipart(
-   *     FormData.create().set("fileField", file)));
-   *
-   * // Or you can pass the file content directly as FilePayload object:
-   * FilePayload filePayload = new FilePayload("f.js", "text/javascript",
-   *       "console.log(2022);".getBytes(StandardCharsets.UTF_8));
-   * APIResponse response = request.fetch("https://example.com/api/uploadTeamList",
-   *   RequestOptions.create().setMethod("post").setMultipart(
-   *     FormData.create().set("fileField", filePayload)));
-   * }</pre>
-   *
-   * @param urlOrRequest Target URL or Request to get all parameters from.
-   * @param params Optional request parameters.
-   * @since v1.16
-   */
-  APIResponse fetch(String urlOrRequest, RequestOptions params);
-  /**
-   * Sends HTTP(S) request and returns its response. The method will populate request cookies from the context and update
-   * context cookies from the response. The method will automatically follow redirects. JSON objects can be passed directly
-   * to the request.
-   *
-   * <p> **Usage**
-   * <pre>{@code
-   * Map<String, Object> data = new HashMap();
-   * data.put("title", "Book Title");
-   * data.put("body", "John Doe");
-   * request.fetch("https://example.com/api/createBook", RequestOptions.create().setMethod("post").setData(data));
-   * }</pre>
-   *
-   * <p> The common way to send file(s) in the body of a request is to encode it as form fields with {@code multipart/form-data}
-   * encoding. You can achieve that with Playwright API like this:
-   * <pre>{@code
-   * // Pass file path to the form data constructor:
-   * Path file = Paths.get("team.csv");
-   * APIResponse response = request.fetch("https://example.com/api/uploadTeamList",
-   *   RequestOptions.create().setMethod("post").setMultipart(
-   *     FormData.create().set("fileField", file)));
-   *
-   * // Or you can pass the file content directly as FilePayload object:
-   * FilePayload filePayload = new FilePayload("f.js", "text/javascript",
-   *       "console.log(2022);".getBytes(StandardCharsets.UTF_8));
-   * APIResponse response = request.fetch("https://example.com/api/uploadTeamList",
-   *   RequestOptions.create().setMethod("post").setMultipart(
-   *     FormData.create().set("fileField", filePayload)));
-   * }</pre>
-   *
-   * @param urlOrRequest Target URL or Request to get all parameters from.
-   * @since v1.16
-   */
-  default APIResponse fetch(Request urlOrRequest) {
-    return fetch(urlOrRequest, null);
-  }
-  /**
-   * Sends HTTP(S) request and returns its response. The method will populate request cookies from the context and update
-   * context cookies from the response. The method will automatically follow redirects. JSON objects can be passed directly
-   * to the request.
-   *
-   * <p> **Usage**
-   * <pre>{@code
-   * Map<String, Object> data = new HashMap();
-   * data.put("title", "Book Title");
-   * data.put("body", "John Doe");
-   * request.fetch("https://example.com/api/createBook", RequestOptions.create().setMethod("post").setData(data));
-   * }</pre>
-   *
-   * <p> The common way to send file(s) in the body of a request is to encode it as form fields with {@code multipart/form-data}
-   * encoding. You can achieve that with Playwright API like this:
-   * <pre>{@code
-   * // Pass file path to the form data constructor:
-   * Path file = Paths.get("team.csv");
-   * APIResponse response = request.fetch("https://example.com/api/uploadTeamList",
-   *   RequestOptions.create().setMethod("post").setMultipart(
-   *     FormData.create().set("fileField", file)));
-   *
-   * // Or you can pass the file content directly as FilePayload object:
-   * FilePayload filePayload = new FilePayload("f.js", "text/javascript",
-   *       "console.log(2022);".getBytes(StandardCharsets.UTF_8));
-   * APIResponse response = request.fetch("https://example.com/api/uploadTeamList",
-   *   RequestOptions.create().setMethod("post").setMultipart(
-   *     FormData.create().set("fileField", filePayload)));
-   * }</pre>
-   *
-   * @param urlOrRequest Target URL or Request to get all parameters from.
-   * @param params Optional request parameters.
-   * @since v1.16
-   */
-  APIResponse fetch(Request urlOrRequest, RequestOptions params);
-  /**
-   * Sends HTTP(S) <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/GET">GET</a> request and returns its
-   * response. The method will populate request cookies from the context and update context cookies from the response. The
-   * method will automatically follow redirects.
-   *
-   * <p> **Usage**
-   *
-   * <p> Request parameters can be configured with {@code params} option, they will be serialized into the URL search parameters:
-   * <pre>{@code
-   * request.get("https://example.com/api/getText", RequestOptions.create()
-   *   .setQueryParam("isbn", "1234")
-   *   .setQueryParam("page", 23));
-   * }</pre>
-   *
-   * @param url Target URL.
-   * @since v1.16
-   */
-  default APIResponse get(String url) {
-    return get(url, null);
-  }
-  /**
-   * Sends HTTP(S) <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/GET">GET</a> request and returns its
-   * response. The method will populate request cookies from the context and update context cookies from the response. The
-   * method will automatically follow redirects.
-   *
-   * <p> **Usage**
-   *
-   * <p> Request parameters can be configured with {@code params} option, they will be serialized into the URL search parameters:
-   * <pre>{@code
-   * request.get("https://example.com/api/getText", RequestOptions.create()
-   *   .setQueryParam("isbn", "1234")
-   *   .setQueryParam("page", 23));
-   * }</pre>
-   *
-   * @param url Target URL.
-   * @param params Optional request parameters.
-   * @since v1.16
-   */
-  APIResponse get(String url, RequestOptions params);
-  /**
-   * Sends HTTP(S) <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/HEAD">HEAD</a> request and returns its
-   * response. The method will populate request cookies from the context and update context cookies from the response. The
-   * method will automatically follow redirects.
-   *
-   * @param url Target URL.
-   * @since v1.16
-   */
-  default APIResponse head(String url) {
-    return head(url, null);
-  }
-  /**
-   * Sends HTTP(S) <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/HEAD">HEAD</a> request and returns its
-   * response. The method will populate request cookies from the context and update context cookies from the response. The
-   * method will automatically follow redirects.
-   *
-   * @param url Target URL.
-   * @param params Optional request parameters.
-   * @since v1.16
-   */
-  APIResponse head(String url, RequestOptions params);
-  /**
-   * Sends HTTP(S) <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/PATCH">PATCH</a> request and returns
-   * its response. The method will populate request cookies from the context and update context cookies from the response.
-   * The method will automatically follow redirects.
-   *
-   * @param url Target URL.
-   * @since v1.16
-   */
-  default APIResponse patch(String url) {
-    return patch(url, null);
-  }
-  /**
-   * Sends HTTP(S) <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/PATCH">PATCH</a> request and returns
-   * its response. The method will populate request cookies from the context and update context cookies from the response.
-   * The method will automatically follow redirects.
-   *
-   * @param url Target URL.
-   * @param params Optional request parameters.
-   * @since v1.16
-   */
-  APIResponse patch(String url, RequestOptions params);
-  /**
-   * Sends HTTP(S) <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/POST">POST</a> request and returns its
-   * response. The method will populate request cookies from the context and update context cookies from the response. The
-   * method will automatically follow redirects.
-   *
-   * <p> **Usage**
-   *
-   * <p> JSON objects can be passed directly to the request:
-   * <pre>{@code
-   * Map<String, Object> data = new HashMap();
-   * data.put("title", "Book Title");
-   * data.put("body", "John Doe");
-   * request.post("https://example.com/api/createBook", RequestOptions.create().setData(data));
-   * }</pre>
-   *
-   * <p> To send form data to the server use {@code form} option. Its value will be encoded into the request body with {@code
-   * application/x-www-form-urlencoded} encoding (see below how to use {@code multipart/form-data} form encoding to send
-   * files):
-   * <pre>{@code
-   * request.post("https://example.com/api/findBook", RequestOptions.create().setForm(
-   *     FormData.create().set("title", "Book Title").set("body", "John Doe")
-   * ));
-   * }</pre>
-   *
-   * <p> The common way to send file(s) in the body of a request is to upload them as form fields with {@code
-   * multipart/form-data} encoding. You can achieve that with Playwright API like this:
-   * <pre>{@code
-   * // Pass file path to the form data constructor:
-   * Path file = Paths.get("team.csv");
-   * APIResponse response = request.post("https://example.com/api/uploadTeamList",
-   *   RequestOptions.create().setMultipart(
-   *     FormData.create().set("fileField", file)));
-   *
-   * // Or you can pass the file content directly as FilePayload object:
-   * FilePayload filePayload = new FilePayload("f.js", "text/javascript",
-   *       "console.log(2022);".getBytes(StandardCharsets.UTF_8));
-   * APIResponse response = request.post("https://example.com/api/uploadTeamList",
-   *   RequestOptions.create().setMultipart(
-   *     FormData.create().set("fileField", filePayload)));
-   * }</pre>
-   *
-   * @param url Target URL.
-   * @since v1.16
-   */
-  default APIResponse post(String url) {
-    return post(url, null);
-  }
-  /**
-   * Sends HTTP(S) <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/POST">POST</a> request and returns its
-   * response. The method will populate request cookies from the context and update context cookies from the response. The
-   * method will automatically follow redirects.
-   *
-   * <p> **Usage**
-   *
-   * <p> JSON objects can be passed directly to the request:
-   * <pre>{@code
-   * Map<String, Object> data = new HashMap();
-   * data.put("title", "Book Title");
-   * data.put("body", "John Doe");
-   * request.post("https://example.com/api/createBook", RequestOptions.create().setData(data));
-   * }</pre>
-   *
-   * <p> To send form data to the server use {@code form} option. Its value will be encoded into the request body with {@code
-   * application/x-www-form-urlencoded} encoding (see below how to use {@code multipart/form-data} form encoding to send
-   * files):
-   * <pre>{@code
-   * request.post("https://example.com/api/findBook", RequestOptions.create().setForm(
-   *     FormData.create().set("title", "Book Title").set("body", "John Doe")
-   * ));
-   * }</pre>
-   *
-   * <p> The common way to send file(s) in the body of a request is to upload them as form fields with {@code
-   * multipart/form-data} encoding. You can achieve that with Playwright API like this:
-   * <pre>{@code
-   * // Pass file path to the form data constructor:
-   * Path file = Paths.get("team.csv");
-   * APIResponse response = request.post("https://example.com/api/uploadTeamList",
-   *   RequestOptions.create().setMultipart(
-   *     FormData.create().set("fileField", file)));
-   *
-   * // Or you can pass the file content directly as FilePayload object:
-   * FilePayload filePayload = new FilePayload("f.js", "text/javascript",
-   *       "console.log(2022);".getBytes(StandardCharsets.UTF_8));
-   * APIResponse response = request.post("https://example.com/api/uploadTeamList",
-   *   RequestOptions.create().setMultipart(
-   *     FormData.create().set("fileField", filePayload)));
-   * }</pre>
-   *
-   * @param url Target URL.
-   * @param params Optional request parameters.
-   * @since v1.16
-   */
-  APIResponse post(String url, RequestOptions params);
-  /**
-   * Sends HTTP(S) <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/PUT">PUT</a> request and returns its
-   * response. The method will populate request cookies from the context and update context cookies from the response. The
-   * method will automatically follow redirects.
-   *
-   * @param url Target URL.
-   * @since v1.16
-   */
-  default APIResponse put(String url) {
-    return put(url, null);
-  }
-  /**
-   * Sends HTTP(S) <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/PUT">PUT</a> request and returns its
-   * response. The method will populate request cookies from the context and update context cookies from the response. The
-   * method will automatically follow redirects.
-   *
-   * @param url Target URL.
-   * @param params Optional request parameters.
-   * @since v1.16
-   */
-  APIResponse put(String url, RequestOptions params);
-  /**
-   * Returns storage state for this request context, contains current cookies and local storage snapshot if it was passed to
-   * the constructor.
-   *
-   * @since v1.16
-   */
-  default String storageState() {
-    return storageState(null);
-  }
-  /**
-   * Returns storage state for this request context, contains current cookies and local storage snapshot if it was passed to
-   * the constructor.
-   *
-   * @since v1.16
-   */
-  String storageState(StorageStateOptions options);
-}
-

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

@@ -1,83 +0,0 @@
-/*
- * Copyright (c) Microsoft Corporation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.microsoft.playwright;
-
-import com.microsoft.playwright.options.*;
-import java.util.*;
-
-/**
- * {@code APIResponse} class represents responses returned by {@link APIRequestContext#get APIRequestContext.get()} and
- * similar methods.
- */
-public interface APIResponse {
-  /**
-   * Returns the buffer with response body.
-   *
-   * @since v1.16
-   */
-  byte[] body();
-  /**
-   * Disposes the body of this response. If not called then the body will stay in memory until the context closes.
-   *
-   * @since v1.16
-   */
-  void dispose();
-  /**
-   * An object with all the response HTTP headers associated with this response.
-   *
-   * @since v1.16
-   */
-  Map<String, String> headers();
-  /**
-   * An array with all the request HTTP headers associated with this response. Header names are not lower-cased. Headers with
-   * multiple entries, such as {@code Set-Cookie}, appear in the array multiple times.
-   *
-   * @since v1.16
-   */
-  List<HttpHeader> headersArray();
-  /**
-   * Contains a boolean stating whether the response was successful (status in the range 200-299) or not.
-   *
-   * @since v1.16
-   */
-  boolean ok();
-  /**
-   * Contains the status code of the response (e.g., 200 for a success).
-   *
-   * @since v1.16
-   */
-  int status();
-  /**
-   * Contains the status text of the response (e.g. usually an "OK" for a success).
-   *
-   * @since v1.16
-   */
-  String statusText();
-  /**
-   * Returns the text representation of response body.
-   *
-   * @since v1.16
-   */
-  String text();
-  /**
-   * Contains the URL of the response.
-   *
-   * @since v1.16
-   */
-  String url();
-}
-

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

@@ -20,7 +20,6 @@ import com.microsoft.playwright.options.*;
 import java.nio.file.Path;
 import java.util.*;
 import java.util.function.Consumer;
-import java.util.function.BooleanSupplier;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
@@ -58,62 +57,17 @@ public interface BrowserContext extends AutoCloseable {
    */
   void offClose(Consumer<BrowserContext> handler);
 
-  /**
-   * Emitted when JavaScript within the page calls one of console API methods, e.g. {@code console.log} or {@code
-   * console.dir}. Also emitted if the page throws an error or a warning.
-   *
-   * <p> The arguments passed into {@code console.log} and the page are available on the {@code ConsoleMessage} event handler
-   * argument.
-   *
-   * <p> **Usage**
-   * <pre>{@code
-   * context.onConsoleMessage(msg -> {
-   *   for (int i = 0; i < msg.args().size(); ++i)
-   *     System.out.println(i + ": " + msg.args().get(i).jsonValue());
-   * });
-   * page.evaluate("() => console.log('hello', 5, { foo: 'bar' })");
-   * }</pre>
-   */
-  void onConsoleMessage(Consumer<ConsoleMessage> handler);
-  /**
-   * Removes handler that was previously added with {@link #onConsoleMessage onConsoleMessage(handler)}.
-   */
-  void offConsoleMessage(Consumer<ConsoleMessage> handler);
-
-  /**
-   * Emitted when a JavaScript dialog appears, such as {@code alert}, {@code prompt}, {@code confirm} or {@code
-   * beforeunload}. Listener **must** either {@link Dialog#accept Dialog.accept()} or {@link Dialog#dismiss Dialog.dismiss()}
-   * the dialog - otherwise the page will <a
-   * href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/EventLoop#never_blocking">freeze</a> waiting for the
-   * dialog, and actions like click will never finish.
-   *
-   * <p> **Usage**
-   * <pre>{@code
-   * context.onDialog(dialog -> {
-   *   dialog.accept();
-   * });
-   * }</pre>
-   *
-   * <p> <strong>NOTE:</strong> When no {@link Page#onDialog Page.onDialog()} or {@link BrowserContext#onDialog BrowserContext.onDialog()} listeners are
-   * present, all dialogs are automatically dismissed.
-   */
-  void onDialog(Consumer<Dialog> handler);
-  /**
-   * Removes handler that was previously added with {@link #onDialog onDialog(handler)}.
-   */
-  void offDialog(Consumer<Dialog> handler);
-
   /**
    * The event is emitted when a new Page is created in the BrowserContext. The page may still be loading. The event will
    * also fire for popup pages. See also {@link Page#onPopup Page.onPopup()} to receive events about popups relevant to a
    * specific page.
    *
    * <p> The earliest moment that page is available is when it has navigated to the initial url. For example, when opening a
-   * popup with {@code window.open('http://example.com')}, this event will fire when the network request to
-   * "http://example.com" is done and its response has started loading in the popup.
+   * popup with {@code window.open('http://example.com')}, this event will fire when the network request to "http://example.com" is
+   * done and its response has started loading in the popup.
    * <pre>{@code
    * Page newPage = context.waitForPage(() -> {
-   *   page.getByText("open new page").click();
+   *   page.click("a[target=_blank]");
    * });
    * System.out.println(newPage.evaluate("location.href"));
    * }</pre>
@@ -156,8 +110,8 @@ public interface BrowserContext extends AutoCloseable {
 
   /**
    * Emitted when a request finishes successfully after downloading the response body. For a successful response, the
-   * sequence of events is {@code request}, {@code response} and {@code requestfinished}. To listen for successful requests
-   * from a particular page, use {@link Page#onRequestFinished Page.onRequestFinished()}.
+   * sequence of events is {@code request}, {@code response} and {@code requestfinished}. To listen for successful requests from a particular
+   * page, use {@link Page#onRequestFinished Page.onRequestFinished()}.
    */
   void onRequestFinished(Consumer<Request> handler);
   /**
@@ -167,8 +121,8 @@ public interface BrowserContext extends AutoCloseable {
 
   /**
    * Emitted when [response] status and headers are received for a request. For a successful response, the sequence of events
-   * is {@code request}, {@code response} and {@code requestfinished}. To listen for response events from a particular page,
-   * use {@link Page#onResponse Page.onResponse()}.
+   * is {@code request}, {@code response} and {@code requestfinished}. To listen for response events from a particular page, use {@link
+   * Page#onResponse Page.onResponse()}.
    */
   void onResponse(Consumer<Response> handler);
   /**
@@ -220,92 +174,6 @@ public interface BrowserContext extends AutoCloseable {
       return this;
     }
   }
-  class RouteFromHAROptions {
-    /**
-     * <ul>
-     * <li> If set to 'abort' any request not found in the HAR file will be aborted.</li>
-     * <li> If set to 'fallback' falls through to the next route handler in the handler chain.</li>
-     * </ul>
-     *
-     * <p> Defaults to abort.
-     */
-    public HarNotFound notFound;
-    /**
-     * If specified, updates the given HAR with the actual network information instead of serving from file. The file is
-     * written to disk when {@link BrowserContext#close BrowserContext.close()} is called.
-     */
-    public Boolean update;
-    /**
-     * Optional setting to control resource content management. If {@code attach} is specified, resources are persisted as
-     * separate files or entries in the ZIP archive. If {@code embed} is specified, content is stored inline the HAR file.
-     */
-    public RouteFromHarUpdateContentPolicy updateContent;
-    /**
-     * When set to {@code minimal}, only record information necessary for routing from HAR. This omits sizes, timing, page,
-     * cookies, security and other types of HAR information that are not used when replaying from HAR. Defaults to {@code
-     * minimal}.
-     */
-    public HarMode updateMode;
-    /**
-     * A glob pattern, regular expression or predicate to match the request URL. Only requests with URL matching the pattern
-     * will be served from the HAR file. If not specified, all requests are served from the HAR file.
-     */
-    public Object url;
-
-    /**
-     * <ul>
-     * <li> If set to 'abort' any request not found in the HAR file will be aborted.</li>
-     * <li> If set to 'fallback' falls through to the next route handler in the handler chain.</li>
-     * </ul>
-     *
-     * <p> Defaults to abort.
-     */
-    public RouteFromHAROptions setNotFound(HarNotFound notFound) {
-      this.notFound = notFound;
-      return this;
-    }
-    /**
-     * If specified, updates the given HAR with the actual network information instead of serving from file. The file is
-     * written to disk when {@link BrowserContext#close BrowserContext.close()} is called.
-     */
-    public RouteFromHAROptions setUpdate(boolean update) {
-      this.update = update;
-      return this;
-    }
-    /**
-     * Optional setting to control resource content management. If {@code attach} is specified, resources are persisted as
-     * separate files or entries in the ZIP archive. If {@code embed} is specified, content is stored inline the HAR file.
-     */
-    public RouteFromHAROptions setUpdateContent(RouteFromHarUpdateContentPolicy updateContent) {
-      this.updateContent = updateContent;
-      return this;
-    }
-    /**
-     * When set to {@code minimal}, only record information necessary for routing from HAR. This omits sizes, timing, page,
-     * cookies, security and other types of HAR information that are not used when replaying from HAR. Defaults to {@code
-     * minimal}.
-     */
-    public RouteFromHAROptions setUpdateMode(HarMode updateMode) {
-      this.updateMode = updateMode;
-      return this;
-    }
-    /**
-     * A glob pattern, regular expression or predicate to match the request URL. Only requests with URL matching the pattern
-     * will be served from the HAR file. If not specified, all requests are served from the HAR file.
-     */
-    public RouteFromHAROptions setUrl(String url) {
-      this.url = url;
-      return this;
-    }
-    /**
-     * A glob pattern, regular expression or predicate to match the request URL. Only requests with URL matching the pattern
-     * will be served from the HAR file. If not specified, all requests are served from the HAR file.
-     */
-    public RouteFromHAROptions setUrl(Pattern url) {
-      this.url = url;
-      return this;
-    }
-  }
   class StorageStateOptions {
     /**
      * The file path to save the storage state to. If {@code path} is a relative path, then it is resolved relative to current
@@ -322,59 +190,14 @@ public interface BrowserContext extends AutoCloseable {
       return this;
     }
   }
-  class WaitForConditionOptions {
-    /**
-     * Maximum time to wait for in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The
-     * default value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or
-     * {@link Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
-     */
-    public Double timeout;
-
-    /**
-     * Maximum time to wait for in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The
-     * default value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or
-     * {@link Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
-     */
-    public WaitForConditionOptions setTimeout(double timeout) {
-      this.timeout = timeout;
-      return this;
-    }
-  }
-  class WaitForConsoleMessageOptions {
-    /**
-     * Receives the {@code ConsoleMessage} object and resolves to truthy value when the waiting should resolve.
-     */
-    public Predicate<ConsoleMessage> predicate;
-    /**
-     * Maximum time to wait for in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The
-     * default value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()}.
-     */
-    public Double timeout;
-
-    /**
-     * Receives the {@code ConsoleMessage} object and resolves to truthy value when the waiting should resolve.
-     */
-    public WaitForConsoleMessageOptions setPredicate(Predicate<ConsoleMessage> predicate) {
-      this.predicate = predicate;
-      return this;
-    }
-    /**
-     * Maximum time to wait for in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The
-     * default value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()}.
-     */
-    public WaitForConsoleMessageOptions setTimeout(double timeout) {
-      this.timeout = timeout;
-      return this;
-    }
-  }
   class WaitForPageOptions {
     /**
      * Receives the {@code Page} object and resolves to truthy value when the waiting should resolve.
      */
     public Predicate<Page> predicate;
     /**
-     * Maximum time to wait for in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The
-     * default value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()}.
+     * Maximum time to wait for in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()}.
      */
     public Double timeout;
 
@@ -386,8 +209,8 @@ public interface BrowserContext extends AutoCloseable {
       return this;
     }
     /**
-     * Maximum time to wait for in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The
-     * default value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()}.
+     * Maximum time to wait for in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()}.
      */
     public WaitForPageOptions setTimeout(double timeout) {
       this.timeout = timeout;
@@ -397,16 +220,9 @@ public interface BrowserContext extends AutoCloseable {
   /**
    * Adds cookies into this browser context. All pages within this context will have these cookies installed. Cookies can be
    * obtained via {@link BrowserContext#cookies BrowserContext.cookies()}.
-   *
-   * <p> **Usage**
    * <pre>{@code
    * browserContext.addCookies(Arrays.asList(cookieObject1, cookieObject2));
    * }</pre>
-   *
-   * @param cookies Adds cookies to the browser context.
-   *
-   * <p> For the cookie to apply to all subdomains as well, prefix domain with a dot, like this: ".example.com".
-   * @since v1.8
    */
   void addCookies(List<Cookie> cookies);
   /**
@@ -420,8 +236,6 @@ public interface BrowserContext extends AutoCloseable {
    * <p> The script is evaluated after the document was created but before any of its scripts were run. This is useful to amend
    * the JavaScript environment, e.g. to seed {@code Math.random}.
    *
-   * <p> **Usage**
-   *
    * <p> An example of overriding {@code Math.random} before the page loads:
    * <pre>{@code
    * // In your playwright script, assuming the preload.js file is in same directory.
@@ -432,7 +246,6 @@ public interface BrowserContext extends AutoCloseable {
    * BrowserContext.addInitScript()} and {@link Page#addInitScript Page.addInitScript()} is not defined.
    *
    * @param script Script to be evaluated in all pages in the browser context.
-   * @since v1.8
    */
   void addInitScript(String script);
   /**
@@ -446,8 +259,6 @@ public interface BrowserContext extends AutoCloseable {
    * <p> The script is evaluated after the document was created but before any of its scripts were run. This is useful to amend
    * the JavaScript environment, e.g. to seed {@code Math.random}.
    *
-   * <p> **Usage**
-   *
    * <p> An example of overriding {@code Math.random} before the page loads:
    * <pre>{@code
    * // In your playwright script, assuming the preload.js file is in same directory.
@@ -458,48 +269,35 @@ public interface BrowserContext extends AutoCloseable {
    * BrowserContext.addInitScript()} and {@link Page#addInitScript Page.addInitScript()} is not defined.
    *
    * @param script Script to be evaluated in all pages in the browser context.
-   * @since v1.8
    */
   void addInitScript(Path script);
   /**
    * Returns the browser instance of the context. If it was launched as a persistent context null gets returned.
-   *
-   * @since v1.8
    */
   Browser browser();
   /**
    * Clears context cookies.
-   *
-   * @since v1.8
    */
   void clearCookies();
   /**
    * Clears all permission overrides for the browser context.
-   *
-   * <p> **Usage**
    * <pre>{@code
    * BrowserContext context = browser.newContext();
    * context.grantPermissions(Arrays.asList("clipboard-read"));
    * // do stuff ..
    * context.clearPermissions();
    * }</pre>
-   *
-   * @since v1.8
    */
   void clearPermissions();
   /**
    * Closes the browser context. All the pages that belong to the browser context will be closed.
    *
    * <p> <strong>NOTE:</strong> The default browser context cannot be closed.
-   *
-   * @since v1.8
    */
   void close();
   /**
    * If no URLs are specified, this method returns all cookies. If URLs are specified, only cookies that affect those URLs
    * are returned.
-   *
-   * @since v1.8
    */
   default List<Cookie> cookies() {
     return cookies((String) null);
@@ -509,7 +307,6 @@ public interface BrowserContext extends AutoCloseable {
    * are returned.
    *
    * @param urls Optional list of URLs.
-   * @since v1.8
    */
   List<Cookie> cookies(String urls);
   /**
@@ -517,24 +314,21 @@ public interface BrowserContext extends AutoCloseable {
    * are returned.
    *
    * @param urls Optional list of URLs.
-   * @since v1.8
    */
   List<Cookie> cookies(List<String> urls);
   /**
-   * The method adds a function called {@code name} on the {@code window} object of every frame in every page in the context.
-   * When called, the function executes {@code callback} and returns a <a
+   * The method adds a function called {@code name} on the {@code window} object of every frame in every page in the context. When
+   * called, the function executes {@code callback} and returns a <a
    * href='https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise'>Promise</a> which
    * resolves to the return value of {@code callback}. If the {@code callback} returns a <a
    * href='https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise'>Promise</a>, it will be
    * awaited.
    *
-   * <p> The first argument of the {@code callback} function contains information about the caller: {@code { browserContext:
-   * BrowserContext, page: Page, frame: Frame }}.
+   * <p> The first argument of the {@code callback} function contains information about the caller: {@code { browserContext: BrowserContext,
+   * page: Page, frame: Frame }}.
    *
    * <p> See {@link Page#exposeBinding Page.exposeBinding()} for page-only version.
    *
-   * <p> **Usage**
-   *
    * <p> An example of exposing page URL to all frames in all pages in the context:
    * <pre>{@code
    * import com.microsoft.playwright.*;
@@ -554,7 +348,7 @@ public interface BrowserContext extends AutoCloseable {
    *         "</script>\n" +
    *         "<button onclick=\"onClick()\">Click me</button>\n" +
    *         "<div></div>");
-   *       page.getByRole(AriaRole.BUTTON).click();
+   *       page.click("button");
    *     }
    *   }
    * }
@@ -577,26 +371,23 @@ public interface BrowserContext extends AutoCloseable {
    *
    * @param name Name of the function on the window object.
    * @param callback Callback function that will be called in the Playwright's context.
-   * @since v1.8
    */
   default void exposeBinding(String name, BindingCallback callback) {
     exposeBinding(name, callback, null);
   }
   /**
-   * The method adds a function called {@code name} on the {@code window} object of every frame in every page in the context.
-   * When called, the function executes {@code callback} and returns a <a
+   * The method adds a function called {@code name} on the {@code window} object of every frame in every page in the context. When
+   * called, the function executes {@code callback} and returns a <a
    * href='https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise'>Promise</a> which
    * resolves to the return value of {@code callback}. If the {@code callback} returns a <a
    * href='https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise'>Promise</a>, it will be
    * awaited.
    *
-   * <p> The first argument of the {@code callback} function contains information about the caller: {@code { browserContext:
-   * BrowserContext, page: Page, frame: Frame }}.
+   * <p> The first argument of the {@code callback} function contains information about the caller: {@code { browserContext: BrowserContext,
+   * page: Page, frame: Frame }}.
    *
    * <p> See {@link Page#exposeBinding Page.exposeBinding()} for page-only version.
    *
-   * <p> **Usage**
-   *
    * <p> An example of exposing page URL to all frames in all pages in the context:
    * <pre>{@code
    * import com.microsoft.playwright.*;
@@ -616,7 +407,7 @@ public interface BrowserContext extends AutoCloseable {
    *         "</script>\n" +
    *         "<button onclick=\"onClick()\">Click me</button>\n" +
    *         "<div></div>");
-   *       page.getByRole(AriaRole.BUTTON).click();
+   *       page.click("button");
    *     }
    *   }
    * }
@@ -639,12 +430,11 @@ public interface BrowserContext extends AutoCloseable {
    *
    * @param name Name of the function on the window object.
    * @param callback Callback function that will be called in the Playwright's context.
-   * @since v1.8
    */
   void exposeBinding(String name, BindingCallback callback, ExposeBindingOptions options);
   /**
-   * The method adds a function called {@code name} on the {@code window} object of every frame in every page in the context.
-   * When called, the function executes {@code callback} and returns a <a
+   * The method adds a function called {@code name} on the {@code window} object of every frame in every page in the context. When
+   * called, the function executes {@code callback} and returns a <a
    * href='https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise'>Promise</a> which
    * resolves to the return value of {@code callback}.
    *
@@ -654,8 +444,6 @@ public interface BrowserContext extends AutoCloseable {
    *
    * <p> See {@link Page#exposeFunction Page.exposeFunction()} for page-only version.
    *
-   * <p> **Usage**
-   *
    * <p> An example of adding a {@code sha256} function to all pages in the context:
    * <pre>{@code
    * import com.microsoft.playwright.*;
@@ -689,7 +477,7 @@ public interface BrowserContext extends AutoCloseable {
    *         "</script>\n" +
    *         "<button onclick=\"onClick()\">Click me</button>\n" +
    *         "<div></div>\n");
-   *       page.getByRole(AriaRole.BUTTON).click();
+   *       page.click("button");
    *     }
    *   }
    * }
@@ -697,7 +485,6 @@ public interface BrowserContext extends AutoCloseable {
    *
    * @param name Name of the function on the window object.
    * @param callback Callback function that will be called in the Playwright's context.
-   * @since v1.8
    */
   void exposeFunction(String name, FunctionCallback callback);
   /**
@@ -710,6 +497,7 @@ public interface BrowserContext extends AutoCloseable {
    * <li> {@code "midi"}</li>
    * <li> {@code "midi-sysex"} (system-exclusive midi)</li>
    * <li> {@code "notifications"}</li>
+   * <li> {@code "push"}</li>
    * <li> {@code "camera"}</li>
    * <li> {@code "microphone"}</li>
    * <li> {@code "background-sync"}</li>
@@ -722,7 +510,6 @@ public interface BrowserContext extends AutoCloseable {
    * <li> {@code "clipboard-write"}</li>
    * <li> {@code "payment-handler"}</li>
    * </ul>
-   * @since v1.8
    */
   default void grantPermissions(List<String> permissions) {
     grantPermissions(permissions, null);
@@ -737,6 +524,7 @@ public interface BrowserContext extends AutoCloseable {
    * <li> {@code "midi"}</li>
    * <li> {@code "midi-sysex"} (system-exclusive midi)</li>
    * <li> {@code "notifications"}</li>
+   * <li> {@code "push"}</li>
    * <li> {@code "camera"}</li>
    * <li> {@code "microphone"}</li>
    * <li> {@code "background-sync"}</li>
@@ -749,36 +537,23 @@ public interface BrowserContext extends AutoCloseable {
    * <li> {@code "clipboard-write"}</li>
    * <li> {@code "payment-handler"}</li>
    * </ul>
-   * @since v1.8
    */
   void grantPermissions(List<String> permissions, GrantPermissionsOptions options);
   /**
    * Creates a new page in the browser context.
-   *
-   * @since v1.8
    */
   Page newPage();
   /**
    * Returns all open pages in the context.
-   *
-   * @since v1.8
    */
   List<Page> pages();
-  /**
-   * API testing helper associated with this context. Requests made with this API will use context cookies.
-   *
-   * @since v1.16
-   */
-  APIRequestContext request();
   /**
    * Routing provides the capability to modify network requests that are made by any page in the browser context. Once route
    * is enabled, every request matching the url pattern will stall unless it's continued, fulfilled or aborted.
    *
-   * <p> <strong>NOTE:</strong> {@link BrowserContext#route BrowserContext.route()} will not intercept requests intercepted by Service Worker. See <a
+   * <p> <strong>NOTE:</strong> {@link Page#route Page.route()} will not intercept requests intercepted by Service Worker. See <a
    * href="https://github.com/microsoft/playwright/issues/1090">this</a> issue. We recommend disabling Service Workers when
-   * using request interception by setting {@code Browser.newContext.serviceWorkers} to {@code "block"}.
-   *
-   * <p> **Usage**
+   * using request interception. Via {@code await context.addInitScript(() => delete window.navigator.serviceWorker);}
    *
    * <p> An example of a naive handler that aborts all image requests:
    * <pre>{@code
@@ -816,11 +591,10 @@ public interface BrowserContext extends AutoCloseable {
    *
    * <p> <strong>NOTE:</strong> Enabling routing disables http cache.
    *
-   * @param url A glob pattern, regex pattern or predicate receiving [URL] to match while routing. When a {@code baseURL} via the
-   * context options was provided and the passed URL is a path, it gets merged via the <a
+   * @param url A glob pattern, regex pattern or predicate receiving [URL] to match while routing. When a {@code baseURL} via the context
+   * options was provided and the passed URL is a path, it gets merged via the <a
    * href="https://developer.mozilla.org/en-US/docs/Web/API/URL/URL">{@code new URL()}</a> constructor.
    * @param handler handler function to route the request.
-   * @since v1.8
    */
   default void route(String url, Consumer<Route> handler) {
     route(url, handler, null);
@@ -829,11 +603,9 @@ public interface BrowserContext extends AutoCloseable {
    * Routing provides the capability to modify network requests that are made by any page in the browser context. Once route
    * is enabled, every request matching the url pattern will stall unless it's continued, fulfilled or aborted.
    *
-   * <p> <strong>NOTE:</strong> {@link BrowserContext#route BrowserContext.route()} will not intercept requests intercepted by Service Worker. See <a
+   * <p> <strong>NOTE:</strong> {@link Page#route Page.route()} will not intercept requests intercepted by Service Worker. See <a
    * href="https://github.com/microsoft/playwright/issues/1090">this</a> issue. We recommend disabling Service Workers when
-   * using request interception by setting {@code Browser.newContext.serviceWorkers} to {@code "block"}.
-   *
-   * <p> **Usage**
+   * using request interception. Via {@code await context.addInitScript(() => delete window.navigator.serviceWorker);}
    *
    * <p> An example of a naive handler that aborts all image requests:
    * <pre>{@code
@@ -871,22 +643,19 @@ public interface BrowserContext extends AutoCloseable {
    *
    * <p> <strong>NOTE:</strong> Enabling routing disables http cache.
    *
-   * @param url A glob pattern, regex pattern or predicate receiving [URL] to match while routing. When a {@code baseURL} via the
-   * context options was provided and the passed URL is a path, it gets merged via the <a
+   * @param url A glob pattern, regex pattern or predicate receiving [URL] to match while routing. When a {@code baseURL} via the context
+   * options was provided and the passed URL is a path, it gets merged via the <a
    * href="https://developer.mozilla.org/en-US/docs/Web/API/URL/URL">{@code new URL()}</a> constructor.
    * @param handler handler function to route the request.
-   * @since v1.8
    */
   void route(String url, Consumer<Route> handler, RouteOptions options);
   /**
    * Routing provides the capability to modify network requests that are made by any page in the browser context. Once route
    * is enabled, every request matching the url pattern will stall unless it's continued, fulfilled or aborted.
    *
-   * <p> <strong>NOTE:</strong> {@link BrowserContext#route BrowserContext.route()} will not intercept requests intercepted by Service Worker. See <a
+   * <p> <strong>NOTE:</strong> {@link Page#route Page.route()} will not intercept requests intercepted by Service Worker. See <a
    * href="https://github.com/microsoft/playwright/issues/1090">this</a> issue. We recommend disabling Service Workers when
-   * using request interception by setting {@code Browser.newContext.serviceWorkers} to {@code "block"}.
-   *
-   * <p> **Usage**
+   * using request interception. Via {@code await context.addInitScript(() => delete window.navigator.serviceWorker);}
    *
    * <p> An example of a naive handler that aborts all image requests:
    * <pre>{@code
@@ -924,11 +693,10 @@ public interface BrowserContext extends AutoCloseable {
    *
    * <p> <strong>NOTE:</strong> Enabling routing disables http cache.
    *
-   * @param url A glob pattern, regex pattern or predicate receiving [URL] to match while routing. When a {@code baseURL} via the
-   * context options was provided and the passed URL is a path, it gets merged via the <a
+   * @param url A glob pattern, regex pattern or predicate receiving [URL] to match while routing. When a {@code baseURL} via the context
+   * options was provided and the passed URL is a path, it gets merged via the <a
    * href="https://developer.mozilla.org/en-US/docs/Web/API/URL/URL">{@code new URL()}</a> constructor.
    * @param handler handler function to route the request.
-   * @since v1.8
    */
   default void route(Pattern url, Consumer<Route> handler) {
     route(url, handler, null);
@@ -937,11 +705,9 @@ public interface BrowserContext extends AutoCloseable {
    * Routing provides the capability to modify network requests that are made by any page in the browser context. Once route
    * is enabled, every request matching the url pattern will stall unless it's continued, fulfilled or aborted.
    *
-   * <p> <strong>NOTE:</strong> {@link BrowserContext#route BrowserContext.route()} will not intercept requests intercepted by Service Worker. See <a
+   * <p> <strong>NOTE:</strong> {@link Page#route Page.route()} will not intercept requests intercepted by Service Worker. See <a
    * href="https://github.com/microsoft/playwright/issues/1090">this</a> issue. We recommend disabling Service Workers when
-   * using request interception by setting {@code Browser.newContext.serviceWorkers} to {@code "block"}.
-   *
-   * <p> **Usage**
+   * using request interception. Via {@code await context.addInitScript(() => delete window.navigator.serviceWorker);}
    *
    * <p> An example of a naive handler that aborts all image requests:
    * <pre>{@code
@@ -979,22 +745,19 @@ public interface BrowserContext extends AutoCloseable {
    *
    * <p> <strong>NOTE:</strong> Enabling routing disables http cache.
    *
-   * @param url A glob pattern, regex pattern or predicate receiving [URL] to match while routing. When a {@code baseURL} via the
-   * context options was provided and the passed URL is a path, it gets merged via the <a
+   * @param url A glob pattern, regex pattern or predicate receiving [URL] to match while routing. When a {@code baseURL} via the context
+   * options was provided and the passed URL is a path, it gets merged via the <a
    * href="https://developer.mozilla.org/en-US/docs/Web/API/URL/URL">{@code new URL()}</a> constructor.
    * @param handler handler function to route the request.
-   * @since v1.8
    */
   void route(Pattern url, Consumer<Route> handler, RouteOptions options);
   /**
    * Routing provides the capability to modify network requests that are made by any page in the browser context. Once route
    * is enabled, every request matching the url pattern will stall unless it's continued, fulfilled or aborted.
    *
-   * <p> <strong>NOTE:</strong> {@link BrowserContext#route BrowserContext.route()} will not intercept requests intercepted by Service Worker. See <a
+   * <p> <strong>NOTE:</strong> {@link Page#route Page.route()} will not intercept requests intercepted by Service Worker. See <a
    * href="https://github.com/microsoft/playwright/issues/1090">this</a> issue. We recommend disabling Service Workers when
-   * using request interception by setting {@code Browser.newContext.serviceWorkers} to {@code "block"}.
-   *
-   * <p> **Usage**
+   * using request interception. Via {@code await context.addInitScript(() => delete window.navigator.serviceWorker);}
    *
    * <p> An example of a naive handler that aborts all image requests:
    * <pre>{@code
@@ -1032,11 +795,10 @@ public interface BrowserContext extends AutoCloseable {
    *
    * <p> <strong>NOTE:</strong> Enabling routing disables http cache.
    *
-   * @param url A glob pattern, regex pattern or predicate receiving [URL] to match while routing. When a {@code baseURL} via the
-   * context options was provided and the passed URL is a path, it gets merged via the <a
+   * @param url A glob pattern, regex pattern or predicate receiving [URL] to match while routing. When a {@code baseURL} via the context
+   * options was provided and the passed URL is a path, it gets merged via the <a
    * href="https://developer.mozilla.org/en-US/docs/Web/API/URL/URL">{@code new URL()}</a> constructor.
    * @param handler handler function to route the request.
-   * @since v1.8
    */
   default void route(Predicate<String> url, Consumer<Route> handler) {
     route(url, handler, null);
@@ -1045,11 +807,9 @@ public interface BrowserContext extends AutoCloseable {
    * Routing provides the capability to modify network requests that are made by any page in the browser context. Once route
    * is enabled, every request matching the url pattern will stall unless it's continued, fulfilled or aborted.
    *
-   * <p> <strong>NOTE:</strong> {@link BrowserContext#route BrowserContext.route()} will not intercept requests intercepted by Service Worker. See <a
+   * <p> <strong>NOTE:</strong> {@link Page#route Page.route()} will not intercept requests intercepted by Service Worker. See <a
    * href="https://github.com/microsoft/playwright/issues/1090">this</a> issue. We recommend disabling Service Workers when
-   * using request interception by setting {@code Browser.newContext.serviceWorkers} to {@code "block"}.
-   *
-   * <p> **Usage**
+   * using request interception. Via {@code await context.addInitScript(() => delete window.navigator.serviceWorker);}
    *
    * <p> An example of a naive handler that aborts all image requests:
    * <pre>{@code
@@ -1087,41 +847,12 @@ public interface BrowserContext extends AutoCloseable {
    *
    * <p> <strong>NOTE:</strong> Enabling routing disables http cache.
    *
-   * @param url A glob pattern, regex pattern or predicate receiving [URL] to match while routing. When a {@code baseURL} via the
-   * context options was provided and the passed URL is a path, it gets merged via the <a
+   * @param url A glob pattern, regex pattern or predicate receiving [URL] to match while routing. When a {@code baseURL} via the context
+   * options was provided and the passed URL is a path, it gets merged via the <a
    * href="https://developer.mozilla.org/en-US/docs/Web/API/URL/URL">{@code new URL()}</a> constructor.
    * @param handler handler function to route the request.
-   * @since v1.8
    */
   void route(Predicate<String> url, Consumer<Route> handler, RouteOptions options);
-  /**
-   * If specified the network requests that are made in the context will be served from the HAR file. Read more about <a
-   * href="https://playwright.dev/java/docs/network#replaying-from-har">Replaying from HAR</a>.
-   *
-   * <p> Playwright will not serve requests intercepted by Service Worker from the HAR file. See <a
-   * href="https://github.com/microsoft/playwright/issues/1090">this</a> issue. We recommend disabling Service Workers when
-   * using request interception by setting {@code Browser.newContext.serviceWorkers} to {@code "block"}.
-   *
-   * @param har Path to a <a href="http://www.softwareishard.com/blog/har-12-spec">HAR</a> file with prerecorded network data. If {@code
-   * path} is a relative path, then it is resolved relative to the current working directory.
-   * @since v1.23
-   */
-  default void routeFromHAR(Path har) {
-    routeFromHAR(har, null);
-  }
-  /**
-   * If specified the network requests that are made in the context will be served from the HAR file. Read more about <a
-   * href="https://playwright.dev/java/docs/network#replaying-from-har">Replaying from HAR</a>.
-   *
-   * <p> Playwright will not serve requests intercepted by Service Worker from the HAR file. See <a
-   * href="https://github.com/microsoft/playwright/issues/1090">this</a> issue. We recommend disabling Service Workers when
-   * using request interception by setting {@code Browser.newContext.serviceWorkers} to {@code "block"}.
-   *
-   * @param har Path to a <a href="http://www.softwareishard.com/blog/har-12-spec">HAR</a> file with prerecorded network data. If {@code
-   * path} is a relative path, then it is resolved relative to the current working directory.
-   * @since v1.23
-   */
-  void routeFromHAR(Path har, RouteFromHAROptions options);
   /**
    * This setting will change the default maximum navigation time for the following methods and related shortcuts:
    * <ul>
@@ -1138,7 +869,6 @@ public interface BrowserContext extends AutoCloseable {
    * BrowserContext.setDefaultNavigationTimeout()}.
    *
    * @param timeout Maximum navigation time in milliseconds
-   * @since v1.8
    */
   void setDefaultNavigationTimeout(double timeout);
   /**
@@ -1150,7 +880,6 @@ public interface BrowserContext extends AutoCloseable {
    * BrowserContext.setDefaultTimeout()}.
    *
    * @param timeout Maximum time in milliseconds
-   * @since v1.8
    */
   void setDefaultTimeout(double timeout);
   /**
@@ -1162,49 +891,34 @@ public interface BrowserContext extends AutoCloseable {
    * in the outgoing requests.
    *
    * @param headers An object containing additional HTTP headers to be sent with every request. All header values must be strings.
-   * @since v1.8
    */
   void setExtraHTTPHeaders(Map<String, String> headers);
   /**
    * Sets the context's geolocation. Passing {@code null} or {@code undefined} emulates position unavailable.
-   *
-   * <p> **Usage**
    * <pre>{@code
    * browserContext.setGeolocation(new Geolocation(59.95, 30.31667));
    * }</pre>
    *
    * <p> <strong>NOTE:</strong> Consider using {@link BrowserContext#grantPermissions BrowserContext.grantPermissions()} to grant permissions for the
    * browser context pages to read its geolocation.
-   *
-   * @since v1.8
    */
   void setGeolocation(Geolocation geolocation);
   /**
    *
    *
    * @param offline Whether to emulate network being offline for the browser context.
-   * @since v1.8
    */
   void setOffline(boolean offline);
   /**
    * Returns storage state for this browser context, contains current cookies and local storage snapshot.
-   *
-   * @since v1.8
    */
   default String storageState() {
     return storageState(null);
   }
   /**
    * Returns storage state for this browser context, contains current cookies and local storage snapshot.
-   *
-   * @since v1.8
    */
   String storageState(StorageStateOptions options);
-  /**
-   *
-   *
-   * @since v1.12
-   */
   Tracing tracing();
   /**
    * Removes a route created with {@link BrowserContext#route BrowserContext.route()}. When {@code handler} is not specified,
@@ -1212,7 +926,6 @@ public interface BrowserContext extends AutoCloseable {
    *
    * @param url A glob pattern, regex pattern or predicate receiving [URL] used to register a routing with {@link BrowserContext#route
    * BrowserContext.route()}.
-   * @since v1.8
    */
   default void unroute(String url) {
     unroute(url, null);
@@ -1224,7 +937,6 @@ public interface BrowserContext extends AutoCloseable {
    * @param url A glob pattern, regex pattern or predicate receiving [URL] used to register a routing with {@link BrowserContext#route
    * BrowserContext.route()}.
    * @param handler Optional handler function used to register a routing with {@link BrowserContext#route BrowserContext.route()}.
-   * @since v1.8
    */
   void unroute(String url, Consumer<Route> handler);
   /**
@@ -1233,7 +945,6 @@ public interface BrowserContext extends AutoCloseable {
    *
    * @param url A glob pattern, regex pattern or predicate receiving [URL] used to register a routing with {@link BrowserContext#route
    * BrowserContext.route()}.
-   * @since v1.8
    */
   default void unroute(Pattern url) {
     unroute(url, null);
@@ -1245,7 +956,6 @@ public interface BrowserContext extends AutoCloseable {
    * @param url A glob pattern, regex pattern or predicate receiving [URL] used to register a routing with {@link BrowserContext#route
    * BrowserContext.route()}.
    * @param handler Optional handler function used to register a routing with {@link BrowserContext#route BrowserContext.route()}.
-   * @since v1.8
    */
   void unroute(Pattern url, Consumer<Route> handler);
   /**
@@ -1254,7 +964,6 @@ public interface BrowserContext extends AutoCloseable {
    *
    * @param url A glob pattern, regex pattern or predicate receiving [URL] used to register a routing with {@link BrowserContext#route
    * BrowserContext.route()}.
-   * @since v1.8
    */
   default void unroute(Predicate<String> url) {
     unroute(url, null);
@@ -1266,97 +975,24 @@ public interface BrowserContext extends AutoCloseable {
    * @param url A glob pattern, regex pattern or predicate receiving [URL] used to register a routing with {@link BrowserContext#route
    * BrowserContext.route()}.
    * @param handler Optional handler function used to register a routing with {@link BrowserContext#route BrowserContext.route()}.
-   * @since v1.8
    */
   void unroute(Predicate<String> url, Consumer<Route> handler);
   /**
-   * The method will block until the condition returns true. All Playwright events will be dispatched while the method is
-   * waiting for the condition.
-   *
-   * <p> **Usage**
-   *
-   * <p> Use the method to wait for a condition that depends on page events:
-   * <pre>{@code
-   * List<String> failedUrls = new ArrayList<>();
-   * context.onResponse(response -> {
-   *   if (!response.ok()) {
-   *     failedUrls.add(response.url());
-   *   }
-   * });
-   * page1.getByText("Create user").click();
-   * page2.getByText("Submit button").click();
-   * context.waitForCondition(() -> failedUrls.size() > 3);
-   * }</pre>
-   *
-   * @param condition Condition to wait for.
-   * @since v1.32
-   */
-  default void waitForCondition(BooleanSupplier condition) {
-    waitForCondition(condition, null);
-  }
-  /**
-   * The method will block until the condition returns true. All Playwright events will be dispatched while the method is
-   * waiting for the condition.
-   *
-   * <p> **Usage**
-   *
-   * <p> Use the method to wait for a condition that depends on page events:
-   * <pre>{@code
-   * List<String> failedUrls = new ArrayList<>();
-   * context.onResponse(response -> {
-   *   if (!response.ok()) {
-   *     failedUrls.add(response.url());
-   *   }
-   * });
-   * page1.getByText("Create user").click();
-   * page2.getByText("Submit button").click();
-   * context.waitForCondition(() -> failedUrls.size() > 3);
-   * }</pre>
-   *
-   * @param condition Condition to wait for.
-   * @since v1.32
-   */
-  void waitForCondition(BooleanSupplier condition, WaitForConditionOptions options);
-  /**
-   * Performs action and waits for a {@code ConsoleMessage} to be logged by in the pages in the context. If predicate is
-   * provided, it passes {@code ConsoleMessage} value into the {@code predicate} function and waits for {@code
-   * predicate(message)} to return a truthy value. Will throw an error if the page is closed before the {@link
-   * BrowserContext#onConsoleMessage BrowserContext.onConsoleMessage()} event is fired.
+   * Performs action and waits for a new {@code Page} to be created in the context. If predicate is provided, it passes {@code Page}
+   * value into the {@code predicate} function and waits for {@code predicate(event)} to return a truthy value. Will throw an error if
+   * the context closes before new {@code Page} is created.
    *
    * @param callback Callback that performs the action triggering the event.
-   * @since v1.34
-   */
-  default ConsoleMessage waitForConsoleMessage(Runnable callback) {
-    return waitForConsoleMessage(null, callback);
-  }
-  /**
-   * Performs action and waits for a {@code ConsoleMessage} to be logged by in the pages in the context. If predicate is
-   * provided, it passes {@code ConsoleMessage} value into the {@code predicate} function and waits for {@code
-   * predicate(message)} to return a truthy value. Will throw an error if the page is closed before the {@link
-   * BrowserContext#onConsoleMessage BrowserContext.onConsoleMessage()} event is fired.
-   *
-   * @param callback Callback that performs the action triggering the event.
-   * @since v1.34
-   */
-  ConsoleMessage waitForConsoleMessage(WaitForConsoleMessageOptions options, Runnable callback);
-  /**
-   * Performs action and waits for a new {@code Page} to be created in the context. If predicate is provided, it passes
-   * {@code Page} value into the {@code predicate} function and waits for {@code predicate(event)} to return a truthy value.
-   * Will throw an error if the context closes before new {@code Page} is created.
-   *
-   * @param callback Callback that performs the action triggering the event.
-   * @since v1.9
    */
   default Page waitForPage(Runnable callback) {
     return waitForPage(null, callback);
   }
   /**
-   * Performs action and waits for a new {@code Page} to be created in the context. If predicate is provided, it passes
-   * {@code Page} value into the {@code predicate} function and waits for {@code predicate(event)} to return a truthy value.
-   * Will throw an error if the context closes before new {@code Page} is created.
+   * Performs action and waits for a new {@code Page} to be created in the context. If predicate is provided, it passes {@code Page}
+   * value into the {@code predicate} function and waits for {@code predicate(event)} to return a truthy value. Will throw an error if
+   * the context closes before new {@code Page} is created.
    *
    * @param callback Callback that performs the action triggering the event.
-   * @since v1.9
    */
   Page waitForPage(WaitForPageOptions options, Runnable callback);
 }

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

@@ -19,7 +19,6 @@ package com.microsoft.playwright;
 import com.microsoft.playwright.options.*;
 import java.nio.file.Path;
 import java.util.*;
-import java.util.regex.Pattern;
 
 /**
  * BrowserType provides methods to launch a specific browser instance or connect to an existing one. The following is a
@@ -53,7 +52,8 @@ public interface BrowserType {
      */
     public Double slowMo;
     /**
-     * Maximum time in milliseconds to wait for the connection to be established. Defaults to {@code 0} (no timeout).
+     * Maximum time in milliseconds to wait for the connection to be established. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to
+     * disable timeout.
      */
     public Double timeout;
 
@@ -73,7 +73,8 @@ public interface BrowserType {
       return this;
     }
     /**
-     * Maximum time in milliseconds to wait for the connection to be established. Defaults to {@code 0} (no timeout).
+     * Maximum time in milliseconds to wait for the connection to be established. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to
+     * disable timeout.
      */
     public ConnectOptions setTimeout(double timeout) {
       this.timeout = timeout;
@@ -91,8 +92,8 @@ public interface BrowserType {
      */
     public Double slowMo;
     /**
-     * Maximum time in milliseconds to wait for the connection to be established. Defaults to {@code 30000} (30 seconds). Pass
-     * {@code 0} to disable timeout.
+     * Maximum time in milliseconds to wait for the connection to be established. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to
+     * disable timeout.
      */
     public Double timeout;
 
@@ -112,8 +113,8 @@ public interface BrowserType {
       return this;
     }
     /**
-     * Maximum time in milliseconds to wait for the connection to be established. Defaults to {@code 30000} (30 seconds). Pass
-     * {@code 0} to disable timeout.
+     * Maximum time in milliseconds to wait for the connection to be established. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to
+     * disable timeout.
      */
     public ConnectOverCDPOptions setTimeout(double timeout) {
       this.timeout = timeout;
@@ -129,7 +130,7 @@ public interface BrowserType {
     /**
      * Browser distribution channel.  Supported values are "chrome", "chrome-beta", "chrome-dev", "chrome-canary", "msedge",
      * "msedge-beta", "msedge-dev", "msedge-canary". Read more about using <a
-     * href="https://playwright.dev/java/docs/browsers#google-chrome--microsoft-edge">Google Chrome and Microsoft Edge</a>.
+     * href="https://playwright.dev/java/docs/browsers/#google-chrome--microsoft-edge">Google Chrome and Microsoft Edge</a>.
      */
     public Object channel;
     /**
@@ -137,8 +138,8 @@ public interface BrowserType {
      */
     public Boolean chromiumSandbox;
     /**
-     * **Chromium-only** Whether to auto-open a Developer Tools panel for each tab. If this option is {@code true}, the {@code
-     * headless} option will be set {@code false}.
+     * **Chromium-only** Whether to auto-open a Developer Tools panel for each tab. If this option is {@code true}, the {@code headless}
+     * option will be set {@code false}.
      */
     public Boolean devtools;
     /**
@@ -177,18 +178,18 @@ public interface BrowserType {
     /**
      * Whether to run browser in headless mode. More details for <a
      * href="https://developers.google.com/web/updates/2017/04/headless-chrome">Chromium</a> and <a
-     * href="https://developer.mozilla.org/en-US/docs/Mozilla/Firefox/Headless_mode">Firefox</a>. Defaults to {@code true}
-     * unless the {@code devtools} option is {@code true}.
+     * href="https://developer.mozilla.org/en-US/docs/Mozilla/Firefox/Headless_mode">Firefox</a>. Defaults to {@code true} unless the
+     * {@code devtools} option is {@code true}.
      */
     public Boolean headless;
     /**
-     * If {@code true}, Playwright does not pass its own configurations args and only uses the ones from {@code args}.
-     * Dangerous option; use with care. Defaults to {@code false}.
+     * If {@code true}, Playwright does not pass its own configurations args and only uses the ones from {@code args}. Dangerous option;
+     * use with care. Defaults to {@code false}.
      */
     public Boolean ignoreAllDefaultArgs;
     /**
-     * If {@code true}, Playwright does not pass its own configurations args and only uses the ones from {@code args}.
-     * Dangerous option; use with care.
+     * If {@code true}, Playwright does not pass its own configurations args and only uses the ones from {@code args}. Dangerous option;
+     * use with care.
      */
     public List<String> ignoreDefaultArgs;
     /**
@@ -200,8 +201,8 @@ public interface BrowserType {
      */
     public Double slowMo;
     /**
-     * Maximum time in milliseconds to wait for the browser instance to start. Defaults to {@code 30000} (30 seconds). Pass
-     * {@code 0} to disable timeout.
+     * Maximum time in milliseconds to wait for the browser instance to start. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to
+     * disable timeout.
      */
     public Double timeout;
     /**
@@ -221,7 +222,7 @@ public interface BrowserType {
     /**
      * Browser distribution channel.  Supported values are "chrome", "chrome-beta", "chrome-dev", "chrome-canary", "msedge",
      * "msedge-beta", "msedge-dev", "msedge-canary". Read more about using <a
-     * href="https://playwright.dev/java/docs/browsers#google-chrome--microsoft-edge">Google Chrome and Microsoft Edge</a>.
+     * href="https://playwright.dev/java/docs/browsers/#google-chrome--microsoft-edge">Google Chrome and Microsoft Edge</a>.
      */
     public LaunchOptions setChannel(BrowserChannel channel) {
       this.channel = channel;
@@ -230,7 +231,7 @@ public interface BrowserType {
     /**
      * Browser distribution channel.  Supported values are "chrome", "chrome-beta", "chrome-dev", "chrome-canary", "msedge",
      * "msedge-beta", "msedge-dev", "msedge-canary". Read more about using <a
-     * href="https://playwright.dev/java/docs/browsers#google-chrome--microsoft-edge">Google Chrome and Microsoft Edge</a>.
+     * href="https://playwright.dev/java/docs/browsers/#google-chrome--microsoft-edge">Google Chrome and Microsoft Edge</a>.
      */
     public LaunchOptions setChannel(String channel) {
       this.channel = channel;
@@ -244,8 +245,8 @@ public interface BrowserType {
       return this;
     }
     /**
-     * **Chromium-only** Whether to auto-open a Developer Tools panel for each tab. If this option is {@code true}, the {@code
-     * headless} option will be set {@code false}.
+     * **Chromium-only** Whether to auto-open a Developer Tools panel for each tab. If this option is {@code true}, the {@code headless}
+     * option will be set {@code false}.
      */
     public LaunchOptions setDevtools(boolean devtools) {
       this.devtools = devtools;
@@ -308,24 +309,24 @@ public interface BrowserType {
     /**
      * Whether to run browser in headless mode. More details for <a
      * href="https://developers.google.com/web/updates/2017/04/headless-chrome">Chromium</a> and <a
-     * href="https://developer.mozilla.org/en-US/docs/Mozilla/Firefox/Headless_mode">Firefox</a>. Defaults to {@code true}
-     * unless the {@code devtools} option is {@code true}.
+     * href="https://developer.mozilla.org/en-US/docs/Mozilla/Firefox/Headless_mode">Firefox</a>. Defaults to {@code true} unless the
+     * {@code devtools} option is {@code true}.
      */
     public LaunchOptions setHeadless(boolean headless) {
       this.headless = headless;
       return this;
     }
     /**
-     * If {@code true}, Playwright does not pass its own configurations args and only uses the ones from {@code args}.
-     * Dangerous option; use with care. Defaults to {@code false}.
+     * If {@code true}, Playwright does not pass its own configurations args and only uses the ones from {@code args}. Dangerous option;
+     * use with care. Defaults to {@code false}.
      */
     public LaunchOptions setIgnoreAllDefaultArgs(boolean ignoreAllDefaultArgs) {
       this.ignoreAllDefaultArgs = ignoreAllDefaultArgs;
       return this;
     }
     /**
-     * If {@code true}, Playwright does not pass its own configurations args and only uses the ones from {@code args}.
-     * Dangerous option; use with care.
+     * If {@code true}, Playwright does not pass its own configurations args and only uses the ones from {@code args}. Dangerous option;
+     * use with care.
      */
     public LaunchOptions setIgnoreDefaultArgs(List<String> ignoreDefaultArgs) {
       this.ignoreDefaultArgs = ignoreDefaultArgs;
@@ -352,8 +353,8 @@ public interface BrowserType {
       return this;
     }
     /**
-     * Maximum time in milliseconds to wait for the browser instance to start. Defaults to {@code 30000} (30 seconds). Pass
-     * {@code 0} to disable timeout.
+     * Maximum time in milliseconds to wait for the browser instance to start. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to
+     * disable timeout.
      */
     public LaunchOptions setTimeout(double timeout) {
       this.timeout = timeout;
@@ -369,7 +370,7 @@ public interface BrowserType {
   }
   class LaunchPersistentContextOptions {
     /**
-     * Whether to automatically download all the attachments. Defaults to {@code true} where all the downloads are accepted.
+     * Whether to automatically download all the attachments. Defaults to {@code false} where all the downloads are canceled.
      */
     public Boolean acceptDownloads;
     /**
@@ -381,26 +382,22 @@ public interface BrowserType {
      * When using {@link Page#navigate Page.navigate()}, {@link Page#route Page.route()}, {@link Page#waitForURL
      * Page.waitForURL()}, {@link Page#waitForRequest Page.waitForRequest()}, or {@link Page#waitForResponse
      * Page.waitForResponse()} it takes the base URL in consideration by using the <a
-     * href="https://developer.mozilla.org/en-US/docs/Web/API/URL/URL">{@code URL()}</a> constructor for building the
-     * corresponding URL. Unset by default. Examples:
+     * href="https://developer.mozilla.org/en-US/docs/Web/API/URL/URL">{@code URL()}</a> constructor for building the corresponding
+     * URL. Examples:
      * <ul>
-     * <li> baseURL: {@code http://localhost:3000} and navigating to {@code /bar.html} results in {@code
-     * http://localhost:3000/bar.html}</li>
-     * <li> baseURL: {@code http://localhost:3000/foo/} and navigating to {@code ./bar.html} results in {@code
-     * http://localhost:3000/foo/bar.html}</li>
-     * <li> baseURL: {@code http://localhost:3000/foo} (without trailing slash) and navigating to {@code ./bar.html} results in
-     * {@code http://localhost:3000/bar.html}</li>
+     * <li> baseURL: {@code http://localhost:3000} and navigating to {@code /bar.html} results in {@code http://localhost:3000/bar.html}</li>
+     * <li> baseURL: {@code http://localhost:3000/foo/} and navigating to {@code ./bar.html} results in {@code http://localhost:3000/foo/bar.html}</li>
      * </ul>
      */
     public String baseURL;
     /**
-     * Toggles bypassing page's Content-Security-Policy. Defaults to {@code false}.
+     * Toggles bypassing page's Content-Security-Policy.
      */
     public Boolean bypassCSP;
     /**
      * Browser distribution channel.  Supported values are "chrome", "chrome-beta", "chrome-dev", "chrome-canary", "msedge",
      * "msedge-beta", "msedge-dev", "msedge-canary". Read more about using <a
-     * href="https://playwright.dev/java/docs/browsers#google-chrome--microsoft-edge">Google Chrome and Microsoft Edge</a>.
+     * href="https://playwright.dev/java/docs/browsers/#google-chrome--microsoft-edge">Google Chrome and Microsoft Edge</a>.
      */
     public Object channel;
     /**
@@ -408,19 +405,17 @@ public interface BrowserType {
      */
     public Boolean chromiumSandbox;
     /**
-     * Emulates {@code "prefers-colors-scheme"} media feature, supported values are {@code "light"}, {@code "dark"}, {@code
-     * "no-preference"}. See {@link Page#emulateMedia Page.emulateMedia()} for more details. Passing {@code null} resets
-     * emulation to system defaults. Defaults to {@code "light"}.
+     * Emulates {@code "prefers-colors-scheme"} media feature, supported values are {@code "light"}, {@code "dark"}, {@code "no-preference"}. See
+     * {@link Page#emulateMedia Page.emulateMedia()} for more details. Defaults to {@code "light"}.
      */
-    public Optional<ColorScheme> colorScheme;
+    public ColorScheme colorScheme;
     /**
-     * Specify device scale factor (can be thought of as dpr). Defaults to {@code 1}. Learn more about <a
-     * href="https://playwright.dev/java/docs/emulation#devices">emulating devices with device scale factor</a>.
+     * Specify device scale factor (can be thought of as dpr). Defaults to {@code 1}.
      */
     public Double deviceScaleFactor;
     /**
-     * **Chromium-only** Whether to auto-open a Developer Tools panel for each tab. If this option is {@code true}, the {@code
-     * headless} option will be set {@code false}.
+     * **Chromium-only** Whether to auto-open a Developer Tools panel for each tab. If this option is {@code true}, the {@code headless}
+     * option will be set {@code false}.
      */
     public Boolean devtools;
     /**
@@ -440,15 +435,17 @@ public interface BrowserType {
      */
     public Path executablePath;
     /**
-     * An object containing additional HTTP headers to be sent with every request. Defaults to none.
+     * An object containing additional HTTP headers to be sent with every request.
      */
     public Map<String, String> extraHTTPHeaders;
     /**
-     * Emulates {@code "forced-colors"} media feature, supported values are {@code "active"}, {@code "none"}. See {@link
-     * Page#emulateMedia Page.emulateMedia()} for more details. Passing {@code null} resets emulation to system defaults.
-     * Defaults to {@code "none"}.
+     * Emulates {@code "forced-colors"} media feature, supported values are {@code "active"}, {@code "none"}. See {@link Page#emulateMedia
+     * Page.emulateMedia()} for more details. Defaults to {@code "none"}.
+     *
+     * <p> <strong>NOTE:</strong> It's not supported in WebKit, see <a href="https://bugs.webkit.org/show_bug.cgi?id=225281">here</a> in their issue
+     * tracker.
      */
-    public Optional<ForcedColors> forcedColors;
+    public ForcedColors forcedColors;
     public Geolocation geolocation;
     /**
      * Close the browser process on SIGHUP. Defaults to {@code true}.
@@ -463,30 +460,28 @@ public interface BrowserType {
      */
     public Boolean handleSIGTERM;
     /**
-     * Specifies if viewport supports touch events. Defaults to false. Learn more about <a
-     * href="https://playwright.dev/java/docs/emulation#devices">mobile emulation</a>.
+     * Specifies if viewport supports touch events. Defaults to false.
      */
     public Boolean hasTouch;
     /**
      * Whether to run browser in headless mode. More details for <a
      * href="https://developers.google.com/web/updates/2017/04/headless-chrome">Chromium</a> and <a
-     * href="https://developer.mozilla.org/en-US/docs/Mozilla/Firefox/Headless_mode">Firefox</a>. Defaults to {@code true}
-     * unless the {@code devtools} option is {@code true}.
+     * href="https://developer.mozilla.org/en-US/docs/Mozilla/Firefox/Headless_mode">Firefox</a>. Defaults to {@code true} unless the
+     * {@code devtools} option is {@code true}.
      */
     public Boolean headless;
     /**
-     * Credentials for <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication">HTTP authentication</a>. If
-     * no origin is specified, the username and password are sent to any servers upon unauthorized responses.
+     * Credentials for <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication">HTTP authentication</a>.
      */
     public HttpCredentials httpCredentials;
     /**
-     * If {@code true}, Playwright does not pass its own configurations args and only uses the ones from {@code args}.
-     * Dangerous option; use with care. Defaults to {@code false}.
+     * If {@code true}, Playwright does not pass its own configurations args and only uses the ones from {@code args}. Dangerous option;
+     * use with care. Defaults to {@code false}.
      */
     public Boolean ignoreAllDefaultArgs;
     /**
-     * If {@code true}, Playwright does not pass its own configurations args and only uses the ones from {@code args}.
-     * Dangerous option; use with care.
+     * If {@code true}, Playwright does not pass its own configurations args and only uses the ones from {@code args}. Dangerous option;
+     * use with care.
      */
     public List<String> ignoreDefaultArgs;
     /**
@@ -494,49 +489,32 @@ public interface BrowserType {
      */
     public Boolean ignoreHTTPSErrors;
     /**
-     * Whether the {@code meta viewport} tag is taken into account and touch events are enabled. isMobile is a part of device,
-     * so you don't actually need to set it manually. Defaults to {@code false} and is not supported in Firefox. Learn more
-     * about <a href="https://playwright.dev/java/docs/emulation#isMobile">mobile emulation</a>.
+     * Whether the {@code meta viewport} tag is taken into account and touch events are enabled. Defaults to {@code false}. Not supported
+     * in Firefox.
      */
     public Boolean isMobile;
     /**
-     * Whether or not to enable JavaScript in the context. Defaults to {@code true}. Learn more about <a
-     * href="https://playwright.dev/java/docs/emulation#javascript-enabled">disabling JavaScript</a>.
+     * Whether or not to enable JavaScript in the context. Defaults to {@code true}.
      */
     public Boolean javaScriptEnabled;
     /**
-     * Specify user locale, for example {@code en-GB}, {@code de-DE}, etc. Locale will affect {@code navigator.language} value,
-     * {@code Accept-Language} request header value as well as number and date formatting rules. Defaults to the system default
-     * locale. Learn more about emulation in our <a
-     * href="https://playwright.dev/java/docs/emulation#locale--timezone">emulation guide</a>.
+     * Specify user locale, for example {@code en-GB}, {@code de-DE}, etc. Locale will affect {@code navigator.language} value, {@code Accept-Language}
+     * request header value as well as number and date formatting rules.
      */
     public String locale;
     /**
-     * Whether to emulate network being offline. Defaults to {@code false}. Learn more about <a
-     * href="https://playwright.dev/java/docs/emulation#offline">network emulation</a>.
+     * Whether to emulate network being offline. Defaults to {@code false}.
      */
     public Boolean offline;
     /**
      * A list of permissions to grant to all pages in this context. See {@link BrowserContext#grantPermissions
-     * BrowserContext.grantPermissions()} for more details. Defaults to none.
+     * BrowserContext.grantPermissions()} for more details.
      */
     public List<String> permissions;
     /**
      * Network proxy settings.
      */
     public Proxy proxy;
-    /**
-     * Optional setting to control resource content management. If {@code omit} is specified, content is not persisted. If
-     * {@code attach} is specified, resources are persisted as separate files and all of these files are archived along with
-     * the HAR file. Defaults to {@code embed}, which stores content inline the HAR file as per HAR specification.
-     */
-    public HarContentPolicy recordHarContent;
-    /**
-     * When set to {@code minimal}, only record information necessary for routing from HAR. This omits sizes, timing, page,
-     * cookies, security and other types of HAR information that are not used when replaying from HAR. Defaults to {@code
-     * full}.
-     */
-    public HarMode recordHarMode;
     /**
      * Optional setting to control whether to omit request content from the HAR. Defaults to {@code false}.
      */
@@ -547,7 +525,6 @@ public interface BrowserType {
      * BrowserContext.close()} for the HAR to be saved.
      */
     public Path recordHarPath;
-    public Object recordHarUrlFilter;
     /**
      * Enables video recording for all pages into the specified directory. If not specified videos are not recorded. Make sure
      * to call {@link BrowserContext#close BrowserContext.close()} for videos to be saved.
@@ -555,50 +532,39 @@ public interface BrowserType {
     public Path recordVideoDir;
     /**
      * Dimensions of the recorded videos. If not specified the size will be equal to {@code viewport} scaled down to fit into
-     * 800x800. If {@code viewport} is not configured explicitly the video size defaults to 800x450. Actual picture of each
-     * page will be scaled down if necessary to fit the specified size.
+     * 800x800. If {@code viewport} is not configured explicitly the video size defaults to 800x450. Actual picture of each page will
+     * be scaled down if necessary to fit the specified size.
      */
     public RecordVideoSize recordVideoSize;
     /**
-     * Emulates {@code "prefers-reduced-motion"} media feature, supported values are {@code "reduce"}, {@code "no-preference"}.
-     * See {@link Page#emulateMedia Page.emulateMedia()} for more details. Passing {@code null} resets emulation to system
-     * defaults. Defaults to {@code "no-preference"}.
+     * Emulates {@code "prefers-reduced-motion"} media feature, supported values are {@code "reduce"}, {@code "no-preference"}. See {@link
+     * Page#emulateMedia Page.emulateMedia()} for more details. Defaults to {@code "no-preference"}.
      */
-    public Optional<ReducedMotion> reducedMotion;
+    public ReducedMotion reducedMotion;
     /**
-     * Emulates consistent window screen size available inside web page via {@code window.screen}. Is only used when the {@code
-     * viewport} is set.
+     * Emulates consistent window screen size available inside web page via {@code window.screen}. Is only used when the {@code viewport}
+     * is set.
      */
     public ScreenSize screenSize;
-    /**
-     * Whether to allow sites to register Service workers. Defaults to {@code "allow"}.
-     * <ul>
-     * <li> {@code "allow"}: <a href="https://developer.mozilla.org/en-US/docs/Web/API/Service_Worker_API">Service Workers</a> can
-     * be registered.</li>
-     * <li> {@code "block"}: Playwright will block all registration of Service Workers.</li>
-     * </ul>
-     */
-    public ServiceWorkerPolicy serviceWorkers;
     /**
      * Slows down Playwright operations by the specified amount of milliseconds. Useful so that you can see what is going on.
      */
     public Double slowMo;
     /**
-     * If set to true, enables strict selectors mode for this context. In the strict selectors mode all operations on selectors
-     * that imply single target DOM element will throw when more than one element matches the selector. This option does not
-     * affect any Locator APIs (Locators are always strict). Defaults to {@code false}. See {@code Locator} to learn more about
-     * the strict mode.
+     * It specified, enables strict selectors mode for this context. In the strict selectors mode all operations on selectors
+     * that imply single target DOM element will throw when more than one element matches the selector. See {@code Locator} to learn
+     * more about the strict mode.
      */
     public Boolean strictSelectors;
     /**
-     * Maximum time in milliseconds to wait for the browser instance to start. Defaults to {@code 30000} (30 seconds). Pass
-     * {@code 0} to disable timeout.
+     * Maximum time in milliseconds to wait for the browser instance to start. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to
+     * disable timeout.
      */
     public Double timeout;
     /**
      * Changes the timezone of the context. See <a
      * href="https://cs.chromium.org/chromium/src/third_party/icu/source/data/misc/metaZones.txt?rcl=faee8bc70570192d82d2978a71e2a615788597d1">ICU's
-     * metaZones.txt</a> for a list of supported timezone IDs. Defaults to the system timezone.
+     * metaZones.txt</a> for a list of supported timezone IDs.
      */
     public String timezoneId;
     /**
@@ -610,17 +576,12 @@ public interface BrowserType {
      */
     public String userAgent;
     /**
-     * Emulates consistent viewport for each page. Defaults to an 1280x720 viewport.  Use {@code null} to disable the
-     * consistent viewport emulation. Learn more about <a href="https://playwright.dev/java/docs/emulation#viewport">viewport
-     * emulation</a>.
-     *
-     * <p> <strong>NOTE:</strong> The {@code null} value opts out from the default presets, makes viewport depend on the host window size defined by the
-     * operating system. It makes the execution of the tests non-deterministic.
+     * Emulates consistent viewport for each page. Defaults to an 1280x720 viewport. {@code null} disables the default viewport.
      */
     public Optional<ViewportSize> viewportSize;
 
     /**
-     * Whether to automatically download all the attachments. Defaults to {@code true} where all the downloads are accepted.
+     * Whether to automatically download all the attachments. Defaults to {@code false} where all the downloads are canceled.
      */
     public LaunchPersistentContextOptions setAcceptDownloads(boolean acceptDownloads) {
       this.acceptDownloads = acceptDownloads;
@@ -638,15 +599,11 @@ public interface BrowserType {
      * When using {@link Page#navigate Page.navigate()}, {@link Page#route Page.route()}, {@link Page#waitForURL
      * Page.waitForURL()}, {@link Page#waitForRequest Page.waitForRequest()}, or {@link Page#waitForResponse
      * Page.waitForResponse()} it takes the base URL in consideration by using the <a
-     * href="https://developer.mozilla.org/en-US/docs/Web/API/URL/URL">{@code URL()}</a> constructor for building the
-     * corresponding URL. Unset by default. Examples:
+     * href="https://developer.mozilla.org/en-US/docs/Web/API/URL/URL">{@code URL()}</a> constructor for building the corresponding
+     * URL. Examples:
      * <ul>
-     * <li> baseURL: {@code http://localhost:3000} and navigating to {@code /bar.html} results in {@code
-     * http://localhost:3000/bar.html}</li>
-     * <li> baseURL: {@code http://localhost:3000/foo/} and navigating to {@code ./bar.html} results in {@code
-     * http://localhost:3000/foo/bar.html}</li>
-     * <li> baseURL: {@code http://localhost:3000/foo} (without trailing slash) and navigating to {@code ./bar.html} results in
-     * {@code http://localhost:3000/bar.html}</li>
+     * <li> baseURL: {@code http://localhost:3000} and navigating to {@code /bar.html} results in {@code http://localhost:3000/bar.html}</li>
+     * <li> baseURL: {@code http://localhost:3000/foo/} and navigating to {@code ./bar.html} results in {@code http://localhost:3000/foo/bar.html}</li>
      * </ul>
      */
     public LaunchPersistentContextOptions setBaseURL(String baseURL) {
@@ -654,7 +611,7 @@ public interface BrowserType {
       return this;
     }
     /**
-     * Toggles bypassing page's Content-Security-Policy. Defaults to {@code false}.
+     * Toggles bypassing page's Content-Security-Policy.
      */
     public LaunchPersistentContextOptions setBypassCSP(boolean bypassCSP) {
       this.bypassCSP = bypassCSP;
@@ -664,7 +621,7 @@ public interface BrowserType {
     /**
      * Browser distribution channel.  Supported values are "chrome", "chrome-beta", "chrome-dev", "chrome-canary", "msedge",
      * "msedge-beta", "msedge-dev", "msedge-canary". Read more about using <a
-     * href="https://playwright.dev/java/docs/browsers#google-chrome--microsoft-edge">Google Chrome and Microsoft Edge</a>.
+     * href="https://playwright.dev/java/docs/browsers/#google-chrome--microsoft-edge">Google Chrome and Microsoft Edge</a>.
      */
     public LaunchPersistentContextOptions setChannel(BrowserChannel channel) {
       this.channel = channel;
@@ -673,7 +630,7 @@ public interface BrowserType {
     /**
      * Browser distribution channel.  Supported values are "chrome", "chrome-beta", "chrome-dev", "chrome-canary", "msedge",
      * "msedge-beta", "msedge-dev", "msedge-canary". Read more about using <a
-     * href="https://playwright.dev/java/docs/browsers#google-chrome--microsoft-edge">Google Chrome and Microsoft Edge</a>.
+     * href="https://playwright.dev/java/docs/browsers/#google-chrome--microsoft-edge">Google Chrome and Microsoft Edge</a>.
      */
     public LaunchPersistentContextOptions setChannel(String channel) {
       this.channel = channel;
@@ -687,25 +644,23 @@ public interface BrowserType {
       return this;
     }
     /**
-     * Emulates {@code "prefers-colors-scheme"} media feature, supported values are {@code "light"}, {@code "dark"}, {@code
-     * "no-preference"}. See {@link Page#emulateMedia Page.emulateMedia()} for more details. Passing {@code null} resets
-     * emulation to system defaults. Defaults to {@code "light"}.
+     * Emulates {@code "prefers-colors-scheme"} media feature, supported values are {@code "light"}, {@code "dark"}, {@code "no-preference"}. See
+     * {@link Page#emulateMedia Page.emulateMedia()} for more details. Defaults to {@code "light"}.
      */
     public LaunchPersistentContextOptions setColorScheme(ColorScheme colorScheme) {
-      this.colorScheme = Optional.ofNullable(colorScheme);
+      this.colorScheme = colorScheme;
       return this;
     }
     /**
-     * Specify device scale factor (can be thought of as dpr). Defaults to {@code 1}. Learn more about <a
-     * href="https://playwright.dev/java/docs/emulation#devices">emulating devices with device scale factor</a>.
+     * Specify device scale factor (can be thought of as dpr). Defaults to {@code 1}.
      */
     public LaunchPersistentContextOptions setDeviceScaleFactor(double deviceScaleFactor) {
       this.deviceScaleFactor = deviceScaleFactor;
       return this;
     }
     /**
-     * **Chromium-only** Whether to auto-open a Developer Tools panel for each tab. If this option is {@code true}, the {@code
-     * headless} option will be set {@code false}.
+     * **Chromium-only** Whether to auto-open a Developer Tools panel for each tab. If this option is {@code true}, the {@code headless}
+     * option will be set {@code false}.
      */
     public LaunchPersistentContextOptions setDevtools(boolean devtools) {
       this.devtools = devtools;
@@ -737,19 +692,21 @@ public interface BrowserType {
       return this;
     }
     /**
-     * An object containing additional HTTP headers to be sent with every request. Defaults to none.
+     * An object containing additional HTTP headers to be sent with every request.
      */
     public LaunchPersistentContextOptions setExtraHTTPHeaders(Map<String, String> extraHTTPHeaders) {
       this.extraHTTPHeaders = extraHTTPHeaders;
       return this;
     }
     /**
-     * Emulates {@code "forced-colors"} media feature, supported values are {@code "active"}, {@code "none"}. See {@link
-     * Page#emulateMedia Page.emulateMedia()} for more details. Passing {@code null} resets emulation to system defaults.
-     * Defaults to {@code "none"}.
+     * Emulates {@code "forced-colors"} media feature, supported values are {@code "active"}, {@code "none"}. See {@link Page#emulateMedia
+     * Page.emulateMedia()} for more details. Defaults to {@code "none"}.
+     *
+     * <p> <strong>NOTE:</strong> It's not supported in WebKit, see <a href="https://bugs.webkit.org/show_bug.cgi?id=225281">here</a> in their issue
+     * tracker.
      */
     public LaunchPersistentContextOptions setForcedColors(ForcedColors forcedColors) {
-      this.forcedColors = Optional.ofNullable(forcedColors);
+      this.forcedColors = forcedColors;
       return this;
     }
     public LaunchPersistentContextOptions setGeolocation(double latitude, double longitude) {
@@ -781,8 +738,7 @@ public interface BrowserType {
       return this;
     }
     /**
-     * Specifies if viewport supports touch events. Defaults to false. Learn more about <a
-     * href="https://playwright.dev/java/docs/emulation#devices">mobile emulation</a>.
+     * Specifies if viewport supports touch events. Defaults to false.
      */
     public LaunchPersistentContextOptions setHasTouch(boolean hasTouch) {
       this.hasTouch = hasTouch;
@@ -791,39 +747,37 @@ public interface BrowserType {
     /**
      * Whether to run browser in headless mode. More details for <a
      * href="https://developers.google.com/web/updates/2017/04/headless-chrome">Chromium</a> and <a
-     * href="https://developer.mozilla.org/en-US/docs/Mozilla/Firefox/Headless_mode">Firefox</a>. Defaults to {@code true}
-     * unless the {@code devtools} option is {@code true}.
+     * href="https://developer.mozilla.org/en-US/docs/Mozilla/Firefox/Headless_mode">Firefox</a>. Defaults to {@code true} unless the
+     * {@code devtools} option is {@code true}.
      */
     public LaunchPersistentContextOptions setHeadless(boolean headless) {
       this.headless = headless;
       return this;
     }
     /**
-     * Credentials for <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication">HTTP authentication</a>. If
-     * no origin is specified, the username and password are sent to any servers upon unauthorized responses.
+     * Credentials for <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication">HTTP authentication</a>.
      */
     public LaunchPersistentContextOptions setHttpCredentials(String username, String password) {
       return setHttpCredentials(new HttpCredentials(username, password));
     }
     /**
-     * Credentials for <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication">HTTP authentication</a>. If
-     * no origin is specified, the username and password are sent to any servers upon unauthorized responses.
+     * Credentials for <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication">HTTP authentication</a>.
      */
     public LaunchPersistentContextOptions setHttpCredentials(HttpCredentials httpCredentials) {
       this.httpCredentials = httpCredentials;
       return this;
     }
     /**
-     * If {@code true}, Playwright does not pass its own configurations args and only uses the ones from {@code args}.
-     * Dangerous option; use with care. Defaults to {@code false}.
+     * If {@code true}, Playwright does not pass its own configurations args and only uses the ones from {@code args}. Dangerous option;
+     * use with care. Defaults to {@code false}.
      */
     public LaunchPersistentContextOptions setIgnoreAllDefaultArgs(boolean ignoreAllDefaultArgs) {
       this.ignoreAllDefaultArgs = ignoreAllDefaultArgs;
       return this;
     }
     /**
-     * If {@code true}, Playwright does not pass its own configurations args and only uses the ones from {@code args}.
-     * Dangerous option; use with care.
+     * If {@code true}, Playwright does not pass its own configurations args and only uses the ones from {@code args}. Dangerous option;
+     * use with care.
      */
     public LaunchPersistentContextOptions setIgnoreDefaultArgs(List<String> ignoreDefaultArgs) {
       this.ignoreDefaultArgs = ignoreDefaultArgs;
@@ -837,35 +791,30 @@ public interface BrowserType {
       return this;
     }
     /**
-     * Whether the {@code meta viewport} tag is taken into account and touch events are enabled. isMobile is a part of device,
-     * so you don't actually need to set it manually. Defaults to {@code false} and is not supported in Firefox. Learn more
-     * about <a href="https://playwright.dev/java/docs/emulation#isMobile">mobile emulation</a>.
+     * Whether the {@code meta viewport} tag is taken into account and touch events are enabled. Defaults to {@code false}. Not supported
+     * in Firefox.
      */
     public LaunchPersistentContextOptions setIsMobile(boolean isMobile) {
       this.isMobile = isMobile;
       return this;
     }
     /**
-     * Whether or not to enable JavaScript in the context. Defaults to {@code true}. Learn more about <a
-     * href="https://playwright.dev/java/docs/emulation#javascript-enabled">disabling JavaScript</a>.
+     * Whether or not to enable JavaScript in the context. Defaults to {@code true}.
      */
     public LaunchPersistentContextOptions setJavaScriptEnabled(boolean javaScriptEnabled) {
       this.javaScriptEnabled = javaScriptEnabled;
       return this;
     }
     /**
-     * Specify user locale, for example {@code en-GB}, {@code de-DE}, etc. Locale will affect {@code navigator.language} value,
-     * {@code Accept-Language} request header value as well as number and date formatting rules. Defaults to the system default
-     * locale. Learn more about emulation in our <a
-     * href="https://playwright.dev/java/docs/emulation#locale--timezone">emulation guide</a>.
+     * Specify user locale, for example {@code en-GB}, {@code de-DE}, etc. Locale will affect {@code navigator.language} value, {@code Accept-Language}
+     * request header value as well as number and date formatting rules.
      */
     public LaunchPersistentContextOptions setLocale(String locale) {
       this.locale = locale;
       return this;
     }
     /**
-     * Whether to emulate network being offline. Defaults to {@code false}. Learn more about <a
-     * href="https://playwright.dev/java/docs/emulation#offline">network emulation</a>.
+     * Whether to emulate network being offline. Defaults to {@code false}.
      */
     public LaunchPersistentContextOptions setOffline(boolean offline) {
       this.offline = offline;
@@ -873,7 +822,7 @@ public interface BrowserType {
     }
     /**
      * A list of permissions to grant to all pages in this context. See {@link BrowserContext#grantPermissions
-     * BrowserContext.grantPermissions()} for more details. Defaults to none.
+     * BrowserContext.grantPermissions()} for more details.
      */
     public LaunchPersistentContextOptions setPermissions(List<String> permissions) {
       this.permissions = permissions;
@@ -892,24 +841,6 @@ public interface BrowserType {
       this.proxy = proxy;
       return this;
     }
-    /**
-     * Optional setting to control resource content management. If {@code omit} is specified, content is not persisted. If
-     * {@code attach} is specified, resources are persisted as separate files and all of these files are archived along with
-     * the HAR file. Defaults to {@code embed}, which stores content inline the HAR file as per HAR specification.
-     */
-    public LaunchPersistentContextOptions setRecordHarContent(HarContentPolicy recordHarContent) {
-      this.recordHarContent = recordHarContent;
-      return this;
-    }
-    /**
-     * When set to {@code minimal}, only record information necessary for routing from HAR. This omits sizes, timing, page,
-     * cookies, security and other types of HAR information that are not used when replaying from HAR. Defaults to {@code
-     * full}.
-     */
-    public LaunchPersistentContextOptions setRecordHarMode(HarMode recordHarMode) {
-      this.recordHarMode = recordHarMode;
-      return this;
-    }
     /**
      * Optional setting to control whether to omit request content from the HAR. Defaults to {@code false}.
      */
@@ -926,14 +857,6 @@ public interface BrowserType {
       this.recordHarPath = recordHarPath;
       return this;
     }
-    public LaunchPersistentContextOptions setRecordHarUrlFilter(String recordHarUrlFilter) {
-      this.recordHarUrlFilter = recordHarUrlFilter;
-      return this;
-    }
-    public LaunchPersistentContextOptions setRecordHarUrlFilter(Pattern recordHarUrlFilter) {
-      this.recordHarUrlFilter = recordHarUrlFilter;
-      return this;
-    }
     /**
      * Enables video recording for all pages into the specified directory. If not specified videos are not recorded. Make sure
      * to call {@link BrowserContext#close BrowserContext.close()} for videos to be saved.
@@ -944,57 +867,44 @@ public interface BrowserType {
     }
     /**
      * Dimensions of the recorded videos. If not specified the size will be equal to {@code viewport} scaled down to fit into
-     * 800x800. If {@code viewport} is not configured explicitly the video size defaults to 800x450. Actual picture of each
-     * page will be scaled down if necessary to fit the specified size.
+     * 800x800. If {@code viewport} is not configured explicitly the video size defaults to 800x450. Actual picture of each page will
+     * be scaled down if necessary to fit the specified size.
      */
     public LaunchPersistentContextOptions setRecordVideoSize(int width, int height) {
       return setRecordVideoSize(new RecordVideoSize(width, height));
     }
     /**
      * Dimensions of the recorded videos. If not specified the size will be equal to {@code viewport} scaled down to fit into
-     * 800x800. If {@code viewport} is not configured explicitly the video size defaults to 800x450. Actual picture of each
-     * page will be scaled down if necessary to fit the specified size.
+     * 800x800. If {@code viewport} is not configured explicitly the video size defaults to 800x450. Actual picture of each page will
+     * be scaled down if necessary to fit the specified size.
      */
     public LaunchPersistentContextOptions setRecordVideoSize(RecordVideoSize recordVideoSize) {
       this.recordVideoSize = recordVideoSize;
       return this;
     }
     /**
-     * Emulates {@code "prefers-reduced-motion"} media feature, supported values are {@code "reduce"}, {@code "no-preference"}.
-     * See {@link Page#emulateMedia Page.emulateMedia()} for more details. Passing {@code null} resets emulation to system
-     * defaults. Defaults to {@code "no-preference"}.
+     * Emulates {@code "prefers-reduced-motion"} media feature, supported values are {@code "reduce"}, {@code "no-preference"}. See {@link
+     * Page#emulateMedia Page.emulateMedia()} for more details. Defaults to {@code "no-preference"}.
      */
     public LaunchPersistentContextOptions setReducedMotion(ReducedMotion reducedMotion) {
-      this.reducedMotion = Optional.ofNullable(reducedMotion);
+      this.reducedMotion = reducedMotion;
       return this;
     }
     /**
-     * Emulates consistent window screen size available inside web page via {@code window.screen}. Is only used when the {@code
-     * viewport} is set.
+     * Emulates consistent window screen size available inside web page via {@code window.screen}. Is only used when the {@code viewport}
+     * is set.
      */
     public LaunchPersistentContextOptions setScreenSize(int width, int height) {
       return setScreenSize(new ScreenSize(width, height));
     }
     /**
-     * Emulates consistent window screen size available inside web page via {@code window.screen}. Is only used when the {@code
-     * viewport} is set.
+     * Emulates consistent window screen size available inside web page via {@code window.screen}. Is only used when the {@code viewport}
+     * is set.
      */
     public LaunchPersistentContextOptions setScreenSize(ScreenSize screenSize) {
       this.screenSize = screenSize;
       return this;
     }
-    /**
-     * Whether to allow sites to register Service workers. Defaults to {@code "allow"}.
-     * <ul>
-     * <li> {@code "allow"}: <a href="https://developer.mozilla.org/en-US/docs/Web/API/Service_Worker_API">Service Workers</a> can
-     * be registered.</li>
-     * <li> {@code "block"}: Playwright will block all registration of Service Workers.</li>
-     * </ul>
-     */
-    public LaunchPersistentContextOptions setServiceWorkers(ServiceWorkerPolicy serviceWorkers) {
-      this.serviceWorkers = serviceWorkers;
-      return this;
-    }
     /**
      * Slows down Playwright operations by the specified amount of milliseconds. Useful so that you can see what is going on.
      */
@@ -1003,18 +913,17 @@ public interface BrowserType {
       return this;
     }
     /**
-     * If set to true, enables strict selectors mode for this context. In the strict selectors mode all operations on selectors
-     * that imply single target DOM element will throw when more than one element matches the selector. This option does not
-     * affect any Locator APIs (Locators are always strict). Defaults to {@code false}. See {@code Locator} to learn more about
-     * the strict mode.
+     * It specified, enables strict selectors mode for this context. In the strict selectors mode all operations on selectors
+     * that imply single target DOM element will throw when more than one element matches the selector. See {@code Locator} to learn
+     * more about the strict mode.
      */
     public LaunchPersistentContextOptions setStrictSelectors(boolean strictSelectors) {
       this.strictSelectors = strictSelectors;
       return this;
     }
     /**
-     * Maximum time in milliseconds to wait for the browser instance to start. Defaults to {@code 30000} (30 seconds). Pass
-     * {@code 0} to disable timeout.
+     * Maximum time in milliseconds to wait for the browser instance to start. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to
+     * disable timeout.
      */
     public LaunchPersistentContextOptions setTimeout(double timeout) {
       this.timeout = timeout;
@@ -1023,7 +932,7 @@ public interface BrowserType {
     /**
      * Changes the timezone of the context. See <a
      * href="https://cs.chromium.org/chromium/src/third_party/icu/source/data/misc/metaZones.txt?rcl=faee8bc70570192d82d2978a71e2a615788597d1">ICU's
-     * metaZones.txt</a> for a list of supported timezone IDs. Defaults to the system timezone.
+     * metaZones.txt</a> for a list of supported timezone IDs.
      */
     public LaunchPersistentContextOptions setTimezoneId(String timezoneId) {
       this.timezoneId = timezoneId;
@@ -1044,23 +953,13 @@ public interface BrowserType {
       return this;
     }
     /**
-     * Emulates consistent viewport for each page. Defaults to an 1280x720 viewport.  Use {@code null} to disable the
-     * consistent viewport emulation. Learn more about <a href="https://playwright.dev/java/docs/emulation#viewport">viewport
-     * emulation</a>.
-     *
-     * <p> <strong>NOTE:</strong> The {@code null} value opts out from the default presets, makes viewport depend on the host window size defined by the
-     * operating system. It makes the execution of the tests non-deterministic.
+     * Emulates consistent viewport for each page. Defaults to an 1280x720 viewport. {@code null} disables the default viewport.
      */
     public LaunchPersistentContextOptions setViewportSize(int width, int height) {
       return setViewportSize(new ViewportSize(width, height));
     }
     /**
-     * Emulates consistent viewport for each page. Defaults to an 1280x720 viewport.  Use {@code null} to disable the
-     * consistent viewport emulation. Learn more about <a href="https://playwright.dev/java/docs/emulation#viewport">viewport
-     * emulation</a>.
-     *
-     * <p> <strong>NOTE:</strong> The {@code null} value opts out from the default presets, makes viewport depend on the host window size defined by the
-     * operating system. It makes the execution of the tests non-deterministic.
+     * Emulates consistent viewport for each page. Defaults to an 1280x720 viewport. {@code null} disables the default viewport.
      */
     public LaunchPersistentContextOptions setViewportSize(ViewportSize viewportSize) {
       this.viewportSize = Optional.ofNullable(viewportSize);
@@ -1068,76 +967,50 @@ public interface BrowserType {
     }
   }
   /**
-   * This method attaches Playwright to an existing browser instance. When connecting to another browser launched via {@code
-   * BrowserType.launchServer} in Node.js, the major and minor version needs to match the client version (1.2.3 → is
-   * compatible with 1.2.x).
+   * This methods attaches Playwright to an existing browser instance.
    *
    * @param wsEndpoint A browser websocket endpoint to connect to.
-   * @since v1.8
    */
   default Browser connect(String wsEndpoint) {
     return connect(wsEndpoint, null);
   }
   /**
-   * This method attaches Playwright to an existing browser instance. When connecting to another browser launched via {@code
-   * BrowserType.launchServer} in Node.js, the major and minor version needs to match the client version (1.2.3 → is
-   * compatible with 1.2.x).
+   * This methods attaches Playwright to an existing browser instance.
    *
    * @param wsEndpoint A browser websocket endpoint to connect to.
-   * @since v1.8
    */
   Browser connect(String wsEndpoint, ConnectOptions options);
   /**
-   * This method attaches Playwright to an existing browser instance using the Chrome DevTools Protocol.
+   * This methods attaches Playwright to an existing browser instance using the Chrome DevTools Protocol.
    *
    * <p> The default browser context is accessible via {@link Browser#contexts Browser.contexts()}.
    *
    * <p> <strong>NOTE:</strong> Connecting over the Chrome DevTools Protocol is only supported for Chromium-based browsers.
    *
-   * <p> **Usage**
-   * <pre>{@code
-   * Browser browser = playwright.chromium().connectOverCDP("http://localhost:9222");
-   * BrowserContext defaultContext = browser.contexts().get(0);
-   * Page page = defaultContext.pages().get(0);
-   * }</pre>
-   *
-   * @param endpointURL A CDP websocket endpoint or http url to connect to. For example {@code http://localhost:9222/} or {@code
-   * ws://127.0.0.1:9222/devtools/browser/387adf4c-243f-4051-a181-46798f4a46f4}.
-   * @since v1.9
+   * @param endpointURL A CDP websocket endpoint or http url to connect to. For example {@code http://localhost:9222/} or
+   * {@code ws://127.0.0.1:9222/devtools/browser/387adf4c-243f-4051-a181-46798f4a46f4}.
    */
   default Browser connectOverCDP(String endpointURL) {
     return connectOverCDP(endpointURL, null);
   }
   /**
-   * This method attaches Playwright to an existing browser instance using the Chrome DevTools Protocol.
+   * This methods attaches Playwright to an existing browser instance using the Chrome DevTools Protocol.
    *
    * <p> The default browser context is accessible via {@link Browser#contexts Browser.contexts()}.
    *
    * <p> <strong>NOTE:</strong> Connecting over the Chrome DevTools Protocol is only supported for Chromium-based browsers.
    *
-   * <p> **Usage**
-   * <pre>{@code
-   * Browser browser = playwright.chromium().connectOverCDP("http://localhost:9222");
-   * BrowserContext defaultContext = browser.contexts().get(0);
-   * Page page = defaultContext.pages().get(0);
-   * }</pre>
-   *
-   * @param endpointURL A CDP websocket endpoint or http url to connect to. For example {@code http://localhost:9222/} or {@code
-   * ws://127.0.0.1:9222/devtools/browser/387adf4c-243f-4051-a181-46798f4a46f4}.
-   * @since v1.9
+   * @param endpointURL A CDP websocket endpoint or http url to connect to. For example {@code http://localhost:9222/} or
+   * {@code ws://127.0.0.1:9222/devtools/browser/387adf4c-243f-4051-a181-46798f4a46f4}.
    */
   Browser connectOverCDP(String endpointURL, ConnectOverCDPOptions options);
   /**
    * A path where Playwright expects to find a bundled browser executable.
-   *
-   * @since v1.8
    */
   String executablePath();
   /**
    * Returns the browser instance.
    *
-   * <p> **Usage**
-   *
    * <p> You can use {@code ignoreDefaultArgs} to filter out {@code --mute-audio} from default arguments:
    * <pre>{@code
    * // Or "firefox" or "webkit".
@@ -1163,8 +1036,6 @@ public interface BrowserType {
    * other differences between Chromium and Chrome. <a
    * href="https://chromium.googlesource.com/chromium/src/+/lkgr/docs/chromium_browser_vs_google_chrome.md">This article</a>
    * describes some differences for Linux users.
-   *
-   * @since v1.8
    */
   default Browser launch() {
     return launch(null);
@@ -1172,8 +1043,6 @@ public interface BrowserType {
   /**
    * Returns the browser instance.
    *
-   * <p> **Usage**
-   *
    * <p> You can use {@code ignoreDefaultArgs} to filter out {@code --mute-audio} from default arguments:
    * <pre>{@code
    * // Or "firefox" or "webkit".
@@ -1199,8 +1068,6 @@ public interface BrowserType {
    * other differences between Chromium and Chrome. <a
    * href="https://chromium.googlesource.com/chromium/src/+/lkgr/docs/chromium_browser_vs_google_chrome.md">This article</a>
    * describes some differences for Linux users.
-   *
-   * @since v1.8
    */
   Browser launch(LaunchOptions options);
   /**
@@ -1212,9 +1079,8 @@ public interface BrowserType {
    * @param userDataDir Path to a User Data Directory, which stores browser session data like cookies and local storage. More details for <a
    * href="https://chromium.googlesource.com/chromium/src/+/master/docs/user_data_dir.md#introduction">Chromium</a> and <a
    * href="https://developer.mozilla.org/en-US/docs/Mozilla/Command_Line_Options#User_Profile">Firefox</a>. Note that
-   * Chromium's user data directory is the **parent** directory of the "Profile Path" seen at {@code chrome://version}. Pass
-   * an empty string to use a temporary directory instead.
-   * @since v1.8
+   * Chromium's user data directory is the **parent** directory of the "Profile Path" seen at {@code chrome://version}. Pass an
+   * empty string to use a temporary directory instead.
    */
   default BrowserContext launchPersistentContext(Path userDataDir) {
     return launchPersistentContext(userDataDir, null);
@@ -1228,15 +1094,12 @@ public interface BrowserType {
    * @param userDataDir Path to a User Data Directory, which stores browser session data like cookies and local storage. More details for <a
    * href="https://chromium.googlesource.com/chromium/src/+/master/docs/user_data_dir.md#introduction">Chromium</a> and <a
    * href="https://developer.mozilla.org/en-US/docs/Mozilla/Command_Line_Options#User_Profile">Firefox</a>. Note that
-   * Chromium's user data directory is the **parent** directory of the "Profile Path" seen at {@code chrome://version}. Pass
-   * an empty string to use a temporary directory instead.
-   * @since v1.8
+   * Chromium's user data directory is the **parent** directory of the "Profile Path" seen at {@code chrome://version}. Pass an
+   * empty string to use a temporary directory instead.
    */
   BrowserContext launchPersistentContext(Path userDataDir, LaunchPersistentContextOptions options);
   /**
    * Returns browser name. For example: {@code "chromium"}, {@code "webkit"} or {@code "firefox"}.
-   *
-   * @since v1.8
    */
   String name();
 }

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

@@ -16,7 +16,7 @@
 
 package com.microsoft.playwright;
 
-import com.microsoft.playwright.impl.driver.Driver;
+import com.microsoft.playwright.impl.Driver;
 
 import java.io.IOException;
 import java.nio.file.Path;
@@ -29,12 +29,11 @@ import static java.util.Arrays.asList;
  */
 public class CLI {
   public static void main(String[] args) throws IOException, InterruptedException {
-    Driver driver = Driver.ensureDriverInstalled(Collections.emptyMap(), false);
-    ProcessBuilder pb = driver.createProcessBuilder();
+    Path driver = Driver.ensureDriverInstalled(Collections.emptyMap());
+    ProcessBuilder pb = new ProcessBuilder(driver.toString());
     pb.command().addAll(asList(args));
-    String version = Playwright.class.getPackage().getImplementationVersion();
-    if (version != null) {
-      pb.environment().put("PW_CLI_DISPLAY_VERSION", version);
+    if (!pb.environment().containsKey("PW_CLI_TARGET_LANG")) {
+      pb.environment().put("PW_CLI_TARGET_LANG", "java");
     }
     pb.inheritIO();
     Process process = pb.start();

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

@@ -19,62 +19,25 @@ package com.microsoft.playwright;
 import java.util.*;
 
 /**
- * {@code ConsoleMessage} objects are dispatched by page via the {@link Page#onConsoleMessage Page.onConsoleMessage()}
- * event. For each console messages logged in the page there will be corresponding event in the Playwright context.
- * <pre>{@code
- * // Listen for all console messages and print them to the standard output.
- * page.onConsoleMessage(msg -> System.out.println(msg.text()));
- *
- * // Listen for all console messages and print errors to the standard output.
- * page.onConsoleMessage(msg -> {
- *   if ("error".equals(msg.type()))
- *     System.out.println("Error text: " + msg.text());
- * });
- *
- * // Get the next console message
- * ConsoleMessage msg = page.waitForConsoleMessage(() -> {
- *   // Issue console.log inside the page
- *   page.evaluate("console.log('hello', 42, { foo: 'bar' });");
- * });
- *
- * // Deconstruct console.log arguments
- * msg.args().get(0).jsonValue() // hello
- * msg.args().get(1).jsonValue() // 42
- * }</pre>
+ * {@code ConsoleMessage} objects are dispatched by page via the {@link Page#onConsoleMessage Page.onConsoleMessage()} event.
  */
 public interface ConsoleMessage {
   /**
-   * List of arguments passed to a {@code console} function call. See also {@link Page#onConsoleMessage
-   * Page.onConsoleMessage()}.
-   *
-   * @since v1.8
+   * List of arguments passed to a {@code console} function call. See also {@link Page#onConsoleMessage Page.onConsoleMessage()}.
    */
   List<JSHandle> args();
   /**
    * URL of the resource followed by 0-based line and column numbers in the resource formatted as {@code URL:line:column}.
-   *
-   * @since v1.8
    */
   String location();
-  /**
-   * The page that produced this console message, if any.
-   *
-   * @since v1.34
-   */
-  Page page();
   /**
    * The text of the console message.
-   *
-   * @since v1.8
    */
   String text();
   /**
-   * One of the following values: {@code "log"}, {@code "debug"}, {@code "info"}, {@code "error"}, {@code "warning"}, {@code
-   * "dir"}, {@code "dirxml"}, {@code "table"}, {@code "trace"}, {@code "clear"}, {@code "startGroup"}, {@code
-   * "startGroupCollapsed"}, {@code "endGroup"}, {@code "assert"}, {@code "profile"}, {@code "profileEnd"}, {@code "count"},
-   * {@code "timeEnd"}.
-   *
-   * @since v1.8
+   * One of the following values: {@code "log"}, {@code "debug"}, {@code "info"}, {@code "error"}, {@code "warning"}, {@code "dir"}, {@code "dirxml"}, {@code "table"},
+   * {@code "trace"}, {@code "clear"}, {@code "startGroup"}, {@code "startGroupCollapsed"}, {@code "endGroup"}, {@code "assert"}, {@code "profile"}, {@code "profileEnd"},
+   * {@code "count"}, {@code "timeEnd"}.
    */
   String type();
 }

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

@@ -16,6 +16,7 @@
 
 package com.microsoft.playwright;
 
+import java.util.*;
 
 /**
  * {@code Dialog} objects are dispatched by page via the {@link Page#onDialog Page.onDialog()} event.
@@ -50,8 +51,6 @@ package com.microsoft.playwright;
 public interface Dialog {
   /**
    * Returns when the dialog has been accepted.
-   *
-   * @since v1.8
    */
   default void accept() {
     accept(null);
@@ -60,37 +59,22 @@ public interface Dialog {
    * Returns when the dialog has been accepted.
    *
    * @param promptText A text to enter in prompt. Does not cause any effects if the dialog's {@code type} is not prompt. Optional.
-   * @since v1.8
    */
   void accept(String promptText);
   /**
    * If dialog is prompt, returns default prompt value. Otherwise, returns empty string.
-   *
-   * @since v1.8
    */
   String defaultValue();
   /**
    * Returns when the dialog has been dismissed.
-   *
-   * @since v1.8
    */
   void dismiss();
   /**
    * A message displayed in the dialog.
-   *
-   * @since v1.8
    */
   String message();
-  /**
-   * The page that initiated this dialog, if available.
-   *
-   * @since v1.34
-   */
-  Page page();
   /**
    * Returns dialog's type, can be one of {@code alert}, {@code beforeunload}, {@code confirm} or {@code prompt}.
-   *
-   * @since v1.8
    */
   String type();
 }

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

@@ -18,6 +18,7 @@ package com.microsoft.playwright;
 
 import java.io.InputStream;
 import java.nio.file.Path;
+import java.util.*;
 
 /**
  * {@code Download} objects are dispatched by page via the {@link Page#onDownload Page.onDownload()} event.
@@ -27,43 +28,43 @@ import java.nio.file.Path;
  * <p> Download event is emitted once the download starts. Download path becomes available once download completes:
  * <pre>{@code
  * // wait for download to start
+ * Download download  = page.waitForDownload(() -> page.click("a"));
+ * // wait for download to complete
+ * Path path = download.path();
+ * }</pre>
+ * <pre>{@code
+ * // wait for download to start
  * Download download = page.waitForDownload(() -> {
- *   page.getByText("Download file").click();
+ *   page.click("a");
  * });
  * // wait for download to complete
  * Path path = download.path();
  * }</pre>
+ *
+ * <p> <strong>NOTE:</strong> Browser context **must** be created with the {@code acceptDownloads} set to {@code true} when user needs access to the downloaded
+ * content. If {@code acceptDownloads} is not set, download events are emitted, but the actual download is not performed and user
+ * has no access to the downloaded files.
  */
 public interface Download {
   /**
-   * Cancels a download. Will not fail if the download is already finished or canceled. Upon successful cancellations, {@code
-   * download.failure()} would resolve to {@code "canceled"}.
-   *
-   * @since v1.13
+   * Cancels a download. Will not fail if the download is already finished or canceled. Upon successful cancellations,
+   * {@code download.failure()} would resolve to {@code "canceled"}.
    */
   void cancel();
   /**
    * Returns readable stream for current download or {@code null} if download failed.
-   *
-   * @since v1.8
    */
   InputStream createReadStream();
   /**
    * Deletes the downloaded file. Will wait for the download to finish if necessary.
-   *
-   * @since v1.8
    */
   void delete();
   /**
    * Returns download error if any. Will wait for the download to finish if necessary.
-   *
-   * @since v1.8
    */
   String failure();
   /**
    * Get the page that the download belongs to.
-   *
-   * @since v1.12
    */
   Page page();
   /**
@@ -72,8 +73,6 @@ public interface Download {
    *
    * <p> Note that the download's file name is a random GUID, use {@link Download#suggestedFilename Download.suggestedFilename()}
    * to get suggested file name.
-   *
-   * @since v1.8
    */
   Path path();
   /**
@@ -81,23 +80,18 @@ public interface Download {
    * wait for the download to finish if necessary.
    *
    * @param path Path where the download should be copied.
-   * @since v1.8
    */
   void saveAs(Path path);
   /**
    * Returns suggested filename for this download. It is typically computed by the browser from the <a
-   * href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Disposition">{@code Content-Disposition}</a>
-   * response header or the {@code download} attribute. See the spec on <a
+   * href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Disposition">{@code Content-Disposition}</a> response
+   * header or the {@code download} attribute. See the spec on <a
    * href="https://html.spec.whatwg.org/#downloading-resources">whatwg</a>. Different browsers can use different logic for
    * computing it.
-   *
-   * @since v1.8
    */
   String suggestedFilename();
   /**
    * Returns downloaded url.
-   *
-   * @since v1.8
    */
   String url();
 }

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

@@ -18,11 +18,12 @@ package com.microsoft.playwright;
 
 import com.microsoft.playwright.options.*;
 import java.nio.file.Path;
+import java.util.*;
 
 /**
  * {@code FileChooser} objects are dispatched by the page in the {@link Page#onFileChooser Page.onFileChooser()} event.
  * <pre>{@code
- * FileChooser fileChooser = page.waitForFileChooser(() -> page.getByText("Upload file").click());
+ * FileChooser fileChooser = page.waitForFileChooser(() -> page.click("upload"));
  * fileChooser.setFiles(Paths.get("myfile.pdf"));
  * }</pre>
  */
@@ -35,9 +36,9 @@ public interface FileChooser {
      */
     public Boolean noWaitAfter;
     /**
-     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
-     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
-     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
+     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be changed by
+     * using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link Page#setDefaultTimeout
+     * Page.setDefaultTimeout()} methods.
      */
     public Double timeout;
 
@@ -51,9 +52,9 @@ public interface FileChooser {
       return this;
     }
     /**
-     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
-     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link
-     * Page#setDefaultTimeout Page.setDefaultTimeout()} methods.
+     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be changed by
+     * using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link Page#setDefaultTimeout
+     * Page.setDefaultTimeout()} methods.
      */
     public SetFilesOptions setTimeout(double timeout) {
       this.timeout = timeout;
@@ -62,84 +63,62 @@ public interface FileChooser {
   }
   /**
    * Returns input element associated with this file chooser.
-   *
-   * @since v1.8
    */
   ElementHandle element();
   /**
    * Returns whether this file chooser accepts multiple files.
-   *
-   * @since v1.8
    */
   boolean isMultiple();
   /**
    * Returns page this file chooser belongs to.
-   *
-   * @since v1.8
    */
   Page page();
   /**
-   * Sets the value of the file input this chooser is associated with. If some of the {@code filePaths} are relative paths,
-   * then they are resolved relative to the current working directory. For empty array, clears the selected files.
-   *
-   * @since v1.8
+   * Sets the value of the file input this chooser is associated with. If some of the {@code filePaths} are relative paths, then
+   * they are resolved relative to the the current working directory. For empty array, clears the selected files.
    */
   default void setFiles(Path files) {
     setFiles(files, null);
   }
   /**
-   * Sets the value of the file input this chooser is associated with. If some of the {@code filePaths} are relative paths,
-   * then they are resolved relative to the current working directory. For empty array, clears the selected files.
-   *
-   * @since v1.8
+   * Sets the value of the file input this chooser is associated with. If some of the {@code filePaths} are relative paths, then
+   * they are resolved relative to the the current working directory. For empty array, clears the selected files.
    */
   void setFiles(Path files, SetFilesOptions options);
   /**
-   * Sets the value of the file input this chooser is associated with. If some of the {@code filePaths} are relative paths,
-   * then they are resolved relative to the current working directory. For empty array, clears the selected files.
-   *
-   * @since v1.8
+   * Sets the value of the file input this chooser is associated with. If some of the {@code filePaths} are relative paths, then
+   * they are resolved relative to the the current working directory. For empty array, clears the selected files.
    */
   default void setFiles(Path[] files) {
     setFiles(files, null);
   }
   /**
-   * Sets the value of the file input this chooser is associated with. If some of the {@code filePaths} are relative paths,
-   * then they are resolved relative to the current working directory. For empty array, clears the selected files.
-   *
-   * @since v1.8
+   * Sets the value of the file input this chooser is associated with. If some of the {@code filePaths} are relative paths, then
+   * they are resolved relative to the the current working directory. For empty array, clears the selected files.
    */
   void setFiles(Path[] files, SetFilesOptions options);
   /**
-   * Sets the value of the file input this chooser is associated with. If some of the {@code filePaths} are relative paths,
-   * then they are resolved relative to the current working directory. For empty array, clears the selected files.
-   *
-   * @since v1.8
+   * Sets the value of the file input this chooser is associated with. If some of the {@code filePaths} are relative paths, then
+   * they are resolved relative to the the current working directory. For empty array, clears the selected files.
    */
   default void setFiles(FilePayload files) {
     setFiles(files, null);
   }
   /**
-   * Sets the value of the file input this chooser is associated with. If some of the {@code filePaths} are relative paths,
-   * then they are resolved relative to the current working directory. For empty array, clears the selected files.
-   *
-   * @since v1.8
+   * Sets the value of the file input this chooser is associated with. If some of the {@code filePaths} are relative paths, then
+   * they are resolved relative to the the current working directory. For empty array, clears the selected files.
    */
   void setFiles(FilePayload files, SetFilesOptions options);
   /**
-   * Sets the value of the file input this chooser is associated with. If some of the {@code filePaths} are relative paths,
-   * then they are resolved relative to the current working directory. For empty array, clears the selected files.
-   *
-   * @since v1.8
+   * Sets the value of the file input this chooser is associated with. If some of the {@code filePaths} are relative paths, then
+   * they are resolved relative to the the current working directory. For empty array, clears the selected files.
    */
   default void setFiles(FilePayload[] files) {
     setFiles(files, null);
   }
   /**
-   * Sets the value of the file input this chooser is associated with. If some of the {@code filePaths} are relative paths,
-   * then they are resolved relative to the current working directory. For empty array, clears the selected files.
-   *
-   * @since v1.8
+   * Sets the value of the file input this chooser is associated with. If some of the {@code filePaths} are relative paths, then
+   * they are resolved relative to the the current working directory. For empty array, clears the selected files.
    */
   void setFiles(FilePayload[] files, SetFilesOptions options);
 }

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

@@ -16,979 +16,55 @@
 
 package com.microsoft.playwright;
 
-import com.microsoft.playwright.options.*;
-import java.util.regex.Pattern;
+import java.util.*;
 
 /**
- * FrameLocator represents a view to the {@code iframe} on the page. It captures the logic sufficient to retrieve the
- * {@code iframe} and locate elements in that iframe. FrameLocator can be created with either {@link Page#frameLocator
+ * FrameLocator represents a view to the {@code iframe} on the page. It captures the logic sufficient to retrieve the {@code iframe}
+ * and locate elements in that iframe. FrameLocator can be created with either {@link Page#frameLocator
  * Page.frameLocator()} or {@link Locator#frameLocator Locator.frameLocator()} method.
  * <pre>{@code
- * Locator locator = page.frameLocator("#my-frame").getByText("Submit");
+ * Locator locator = page.frameLocator("#my-frame").locator("text=Submit");
  * locator.click();
  * }</pre>
  *
  * <p> **Strictness**
  *
  * <p> Frame locators are strict. This means that all operations on frame locators will throw if more than one element matches
- * a given selector.
+ * given selector.
  * <pre>{@code
  * // Throws if there are several frames in DOM:
- * page.frame_locator(".result-frame").getByRole(AriaRole.BUTTON).click();
+ * page.frame_locator(".result-frame").locator("button").click();
  *
  * // Works because we explicitly tell locator to pick the first frame:
- * page.frame_locator(".result-frame").first().getByRole(AriaRole.BUTTON).click();
- * }</pre>
- *
- * <p> **Converting Locator to FrameLocator**
- *
- * <p> If you have a {@code Locator} object pointing to an {@code iframe} it can be converted to {@code FrameLocator} using <a
- * href="https://developer.mozilla.org/en-US/docs/Web/CSS/:scope">{@code :scope}</a> CSS selector:
- * <pre>{@code
- * Locator frameLocator = locator.frameLocator(':scope');
+ * page.frame_locator(".result-frame").first().locator("button").click();
  * }</pre>
  */
 public interface FrameLocator {
-  class GetByAltTextOptions {
-    /**
-     * Whether to find an exact match: case-sensitive and whole-string. Default to false. Ignored when locating by a regular
-     * expression. Note that exact match still trims whitespace.
-     */
-    public Boolean exact;
-
-    /**
-     * Whether to find an exact match: case-sensitive and whole-string. Default to false. Ignored when locating by a regular
-     * expression. Note that exact match still trims whitespace.
-     */
-    public GetByAltTextOptions setExact(boolean exact) {
-      this.exact = exact;
-      return this;
-    }
-  }
-  class GetByLabelOptions {
-    /**
-     * Whether to find an exact match: case-sensitive and whole-string. Default to false. Ignored when locating by a regular
-     * expression. Note that exact match still trims whitespace.
-     */
-    public Boolean exact;
-
-    /**
-     * Whether to find an exact match: case-sensitive and whole-string. Default to false. Ignored when locating by a regular
-     * expression. Note that exact match still trims whitespace.
-     */
-    public GetByLabelOptions setExact(boolean exact) {
-      this.exact = exact;
-      return this;
-    }
-  }
-  class GetByPlaceholderOptions {
-    /**
-     * Whether to find an exact match: case-sensitive and whole-string. Default to false. Ignored when locating by a regular
-     * expression. Note that exact match still trims whitespace.
-     */
-    public Boolean exact;
-
-    /**
-     * Whether to find an exact match: case-sensitive and whole-string. Default to false. Ignored when locating by a regular
-     * expression. Note that exact match still trims whitespace.
-     */
-    public GetByPlaceholderOptions setExact(boolean exact) {
-      this.exact = exact;
-      return this;
-    }
-  }
-  class GetByRoleOptions {
-    /**
-     * An attribute that is usually set by {@code aria-checked} or native {@code <input type=checkbox>} controls.
-     *
-     * <p> Learn more about <a href="https://www.w3.org/TR/wai-aria-1.2/#aria-checked">{@code aria-checked}</a>.
-     */
-    public Boolean checked;
-    /**
-     * An attribute that is usually set by {@code aria-disabled} or {@code disabled}.
-     *
-     * <p> <strong>NOTE:</strong> Unlike most other attributes, {@code disabled} is inherited through the DOM hierarchy. Learn more about <a
-     * href="https://www.w3.org/TR/wai-aria-1.2/#aria-disabled">{@code aria-disabled}</a>.
-     */
-    public Boolean disabled;
-    /**
-     * Whether {@code name} is matched exactly: case-sensitive and whole-string. Defaults to false. Ignored when {@code name}
-     * is a regular expression. Note that exact match still trims whitespace.
-     */
-    public Boolean exact;
-    /**
-     * An attribute that is usually set by {@code aria-expanded}.
-     *
-     * <p> Learn more about <a href="https://www.w3.org/TR/wai-aria-1.2/#aria-expanded">{@code aria-expanded}</a>.
-     */
-    public Boolean expanded;
-    /**
-     * Option that controls whether hidden elements are matched. By default, only non-hidden elements, as <a
-     * href="https://www.w3.org/TR/wai-aria-1.2/#tree_exclusion">defined by ARIA</a>, are matched by role selector.
-     *
-     * <p> Learn more about <a href="https://www.w3.org/TR/wai-aria-1.2/#aria-hidden">{@code aria-hidden}</a>.
-     */
-    public Boolean includeHidden;
-    /**
-     * A number attribute that is usually present for roles {@code heading}, {@code listitem}, {@code row}, {@code treeitem},
-     * with default values for {@code <h1>-<h6>} elements.
-     *
-     * <p> Learn more about <a href="https://www.w3.org/TR/wai-aria-1.2/#aria-level">{@code aria-level}</a>.
-     */
-    public Integer level;
-    /**
-     * Option to match the <a href="https://w3c.github.io/accname/#dfn-accessible-name">accessible name</a>. By default,
-     * matching is case-insensitive and searches for a substring, use {@code exact} to control this behavior.
-     *
-     * <p> Learn more about <a href="https://w3c.github.io/accname/#dfn-accessible-name">accessible name</a>.
-     */
-    public Object name;
-    /**
-     * An attribute that is usually set by {@code aria-pressed}.
-     *
-     * <p> Learn more about <a href="https://www.w3.org/TR/wai-aria-1.2/#aria-pressed">{@code aria-pressed}</a>.
-     */
-    public Boolean pressed;
-    /**
-     * An attribute that is usually set by {@code aria-selected}.
-     *
-     * <p> Learn more about <a href="https://www.w3.org/TR/wai-aria-1.2/#aria-selected">{@code aria-selected}</a>.
-     */
-    public Boolean selected;
-
-    /**
-     * An attribute that is usually set by {@code aria-checked} or native {@code <input type=checkbox>} controls.
-     *
-     * <p> Learn more about <a href="https://www.w3.org/TR/wai-aria-1.2/#aria-checked">{@code aria-checked}</a>.
-     */
-    public GetByRoleOptions setChecked(boolean checked) {
-      this.checked = checked;
-      return this;
-    }
-    /**
-     * An attribute that is usually set by {@code aria-disabled} or {@code disabled}.
-     *
-     * <p> <strong>NOTE:</strong> Unlike most other attributes, {@code disabled} is inherited through the DOM hierarchy. Learn more about <a
-     * href="https://www.w3.org/TR/wai-aria-1.2/#aria-disabled">{@code aria-disabled}</a>.
-     */
-    public GetByRoleOptions setDisabled(boolean disabled) {
-      this.disabled = disabled;
-      return this;
-    }
-    /**
-     * Whether {@code name} is matched exactly: case-sensitive and whole-string. Defaults to false. Ignored when {@code name}
-     * is a regular expression. Note that exact match still trims whitespace.
-     */
-    public GetByRoleOptions setExact(boolean exact) {
-      this.exact = exact;
-      return this;
-    }
-    /**
-     * An attribute that is usually set by {@code aria-expanded}.
-     *
-     * <p> Learn more about <a href="https://www.w3.org/TR/wai-aria-1.2/#aria-expanded">{@code aria-expanded}</a>.
-     */
-    public GetByRoleOptions setExpanded(boolean expanded) {
-      this.expanded = expanded;
-      return this;
-    }
-    /**
-     * Option that controls whether hidden elements are matched. By default, only non-hidden elements, as <a
-     * href="https://www.w3.org/TR/wai-aria-1.2/#tree_exclusion">defined by ARIA</a>, are matched by role selector.
-     *
-     * <p> Learn more about <a href="https://www.w3.org/TR/wai-aria-1.2/#aria-hidden">{@code aria-hidden}</a>.
-     */
-    public GetByRoleOptions setIncludeHidden(boolean includeHidden) {
-      this.includeHidden = includeHidden;
-      return this;
-    }
-    /**
-     * A number attribute that is usually present for roles {@code heading}, {@code listitem}, {@code row}, {@code treeitem},
-     * with default values for {@code <h1>-<h6>} elements.
-     *
-     * <p> Learn more about <a href="https://www.w3.org/TR/wai-aria-1.2/#aria-level">{@code aria-level}</a>.
-     */
-    public GetByRoleOptions setLevel(int level) {
-      this.level = level;
-      return this;
-    }
-    /**
-     * Option to match the <a href="https://w3c.github.io/accname/#dfn-accessible-name">accessible name</a>. By default,
-     * matching is case-insensitive and searches for a substring, use {@code exact} to control this behavior.
-     *
-     * <p> Learn more about <a href="https://w3c.github.io/accname/#dfn-accessible-name">accessible name</a>.
-     */
-    public GetByRoleOptions setName(String name) {
-      this.name = name;
-      return this;
-    }
-    /**
-     * Option to match the <a href="https://w3c.github.io/accname/#dfn-accessible-name">accessible name</a>. By default,
-     * matching is case-insensitive and searches for a substring, use {@code exact} to control this behavior.
-     *
-     * <p> Learn more about <a href="https://w3c.github.io/accname/#dfn-accessible-name">accessible name</a>.
-     */
-    public GetByRoleOptions setName(Pattern name) {
-      this.name = name;
-      return this;
-    }
-    /**
-     * An attribute that is usually set by {@code aria-pressed}.
-     *
-     * <p> Learn more about <a href="https://www.w3.org/TR/wai-aria-1.2/#aria-pressed">{@code aria-pressed}</a>.
-     */
-    public GetByRoleOptions setPressed(boolean pressed) {
-      this.pressed = pressed;
-      return this;
-    }
-    /**
-     * An attribute that is usually set by {@code aria-selected}.
-     *
-     * <p> Learn more about <a href="https://www.w3.org/TR/wai-aria-1.2/#aria-selected">{@code aria-selected}</a>.
-     */
-    public GetByRoleOptions setSelected(boolean selected) {
-      this.selected = selected;
-      return this;
-    }
-  }
-  class GetByTextOptions {
-    /**
-     * Whether to find an exact match: case-sensitive and whole-string. Default to false. Ignored when locating by a regular
-     * expression. Note that exact match still trims whitespace.
-     */
-    public Boolean exact;
-
-    /**
-     * Whether to find an exact match: case-sensitive and whole-string. Default to false. Ignored when locating by a regular
-     * expression. Note that exact match still trims whitespace.
-     */
-    public GetByTextOptions setExact(boolean exact) {
-      this.exact = exact;
-      return this;
-    }
-  }
-  class GetByTitleOptions {
-    /**
-     * Whether to find an exact match: case-sensitive and whole-string. Default to false. Ignored when locating by a regular
-     * expression. Note that exact match still trims whitespace.
-     */
-    public Boolean exact;
-
-    /**
-     * Whether to find an exact match: case-sensitive and whole-string. Default to false. Ignored when locating by a regular
-     * expression. Note that exact match still trims whitespace.
-     */
-    public GetByTitleOptions setExact(boolean exact) {
-      this.exact = exact;
-      return this;
-    }
-  }
-  class LocatorOptions {
-    /**
-     * Matches elements containing an element that matches an inner locator. Inner locator is queried against the outer one.
-     * For example, {@code article} that has {@code text=Playwright} matches {@code <article><div>Playwright</div></article>}.
-     *
-     * <p> Note that outer and inner locators must belong to the same frame. Inner locator must not contain {@code FrameLocator}s.
-     */
-    public Locator has;
-    /**
-     * Matches elements that do not contain an element that matches an inner locator. Inner locator is queried against the
-     * outer one. For example, {@code article} that does not have {@code div} matches {@code
-     * <article><span>Playwright</span></article>}.
-     *
-     * <p> Note that outer and inner locators must belong to the same frame. Inner locator must not contain {@code FrameLocator}s.
-     */
-    public Locator hasNot;
-    /**
-     * Matches elements that do not contain specified text somewhere inside, possibly in a child or a descendant element. When
-     * passed a [string], matching is case-insensitive and searches for a substring.
-     */
-    public Object hasNotText;
-    /**
-     * Matches elements containing specified text somewhere inside, possibly in a child or a descendant element. When passed a
-     * [string], matching is case-insensitive and searches for a substring. For example, {@code "Playwright"} matches {@code
-     * <article><div>Playwright</div></article>}.
-     */
-    public Object hasText;
-
-    /**
-     * Matches elements containing an element that matches an inner locator. Inner locator is queried against the outer one.
-     * For example, {@code article} that has {@code text=Playwright} matches {@code <article><div>Playwright</div></article>}.
-     *
-     * <p> Note that outer and inner locators must belong to the same frame. Inner locator must not contain {@code FrameLocator}s.
-     */
-    public LocatorOptions setHas(Locator has) {
-      this.has = has;
-      return this;
-    }
-    /**
-     * Matches elements that do not contain an element that matches an inner locator. Inner locator is queried against the
-     * outer one. For example, {@code article} that does not have {@code div} matches {@code
-     * <article><span>Playwright</span></article>}.
-     *
-     * <p> Note that outer and inner locators must belong to the same frame. Inner locator must not contain {@code FrameLocator}s.
-     */
-    public LocatorOptions setHasNot(Locator hasNot) {
-      this.hasNot = hasNot;
-      return this;
-    }
-    /**
-     * Matches elements that do not contain specified text somewhere inside, possibly in a child or a descendant element. When
-     * passed a [string], matching is case-insensitive and searches for a substring.
-     */
-    public LocatorOptions setHasNotText(String hasNotText) {
-      this.hasNotText = hasNotText;
-      return this;
-    }
-    /**
-     * Matches elements that do not contain specified text somewhere inside, possibly in a child or a descendant element. When
-     * passed a [string], matching is case-insensitive and searches for a substring.
-     */
-    public LocatorOptions setHasNotText(Pattern hasNotText) {
-      this.hasNotText = hasNotText;
-      return this;
-    }
-    /**
-     * Matches elements containing specified text somewhere inside, possibly in a child or a descendant element. When passed a
-     * [string], matching is case-insensitive and searches for a substring. For example, {@code "Playwright"} matches {@code
-     * <article><div>Playwright</div></article>}.
-     */
-    public LocatorOptions setHasText(String hasText) {
-      this.hasText = hasText;
-      return this;
-    }
-    /**
-     * Matches elements containing specified text somewhere inside, possibly in a child or a descendant element. When passed a
-     * [string], matching is case-insensitive and searches for a substring. For example, {@code "Playwright"} matches {@code
-     * <article><div>Playwright</div></article>}.
-     */
-    public LocatorOptions setHasText(Pattern hasText) {
-      this.hasText = hasText;
-      return this;
-    }
-  }
   /**
    * Returns locator to the first matching frame.
-   *
-   * @since v1.17
    */
   FrameLocator first();
   /**
    * When working with iframes, you can create a frame locator that will enter the iframe and allow selecting elements in
    * that iframe.
    *
-   * @param selector A selector to use when resolving DOM element.
-   * @since v1.17
+   * @param selector A selector to use when resolving DOM element. See <a href="https://playwright.dev/java/docs/selectors/">working with
+   * selectors</a> for more details.
    */
   FrameLocator frameLocator(String selector);
-  /**
-   * Allows locating elements by their alt text.
-   *
-   * <p> **Usage**
-   *
-   * <p> For example, this method will find the image by alt text "Playwright logo":
-   * <pre>{@code
-   * page.getByAltText("Playwright logo").click();
-   * }</pre>
-   *
-   * @param text Text to locate the element for.
-   * @since v1.27
-   */
-  default Locator getByAltText(String text) {
-    return getByAltText(text, null);
-  }
-  /**
-   * Allows locating elements by their alt text.
-   *
-   * <p> **Usage**
-   *
-   * <p> For example, this method will find the image by alt text "Playwright logo":
-   * <pre>{@code
-   * page.getByAltText("Playwright logo").click();
-   * }</pre>
-   *
-   * @param text Text to locate the element for.
-   * @since v1.27
-   */
-  Locator getByAltText(String text, GetByAltTextOptions options);
-  /**
-   * Allows locating elements by their alt text.
-   *
-   * <p> **Usage**
-   *
-   * <p> For example, this method will find the image by alt text "Playwright logo":
-   * <pre>{@code
-   * page.getByAltText("Playwright logo").click();
-   * }</pre>
-   *
-   * @param text Text to locate the element for.
-   * @since v1.27
-   */
-  default Locator getByAltText(Pattern text) {
-    return getByAltText(text, null);
-  }
-  /**
-   * Allows locating elements by their alt text.
-   *
-   * <p> **Usage**
-   *
-   * <p> For example, this method will find the image by alt text "Playwright logo":
-   * <pre>{@code
-   * page.getByAltText("Playwright logo").click();
-   * }</pre>
-   *
-   * @param text Text to locate the element for.
-   * @since v1.27
-   */
-  Locator getByAltText(Pattern text, GetByAltTextOptions options);
-  /**
-   * Allows locating input elements by the text of the associated {@code <label>} or {@code aria-labelledby} element, or by
-   * the {@code aria-label} attribute.
-   *
-   * <p> **Usage**
-   *
-   * <p> For example, this method will find inputs by label "Username" and "Password" in the following DOM:
-   * <pre>{@code
-   * page.getByLabel("Username").fill("john");
-   * page.getByLabel("Password").fill("secret");
-   * }</pre>
-   *
-   * @param text Text to locate the element for.
-   * @since v1.27
-   */
-  default Locator getByLabel(String text) {
-    return getByLabel(text, null);
-  }
-  /**
-   * Allows locating input elements by the text of the associated {@code <label>} or {@code aria-labelledby} element, or by
-   * the {@code aria-label} attribute.
-   *
-   * <p> **Usage**
-   *
-   * <p> For example, this method will find inputs by label "Username" and "Password" in the following DOM:
-   * <pre>{@code
-   * page.getByLabel("Username").fill("john");
-   * page.getByLabel("Password").fill("secret");
-   * }</pre>
-   *
-   * @param text Text to locate the element for.
-   * @since v1.27
-   */
-  Locator getByLabel(String text, GetByLabelOptions options);
-  /**
-   * Allows locating input elements by the text of the associated {@code <label>} or {@code aria-labelledby} element, or by
-   * the {@code aria-label} attribute.
-   *
-   * <p> **Usage**
-   *
-   * <p> For example, this method will find inputs by label "Username" and "Password" in the following DOM:
-   * <pre>{@code
-   * page.getByLabel("Username").fill("john");
-   * page.getByLabel("Password").fill("secret");
-   * }</pre>
-   *
-   * @param text Text to locate the element for.
-   * @since v1.27
-   */
-  default Locator getByLabel(Pattern text) {
-    return getByLabel(text, null);
-  }
-  /**
-   * Allows locating input elements by the text of the associated {@code <label>} or {@code aria-labelledby} element, or by
-   * the {@code aria-label} attribute.
-   *
-   * <p> **Usage**
-   *
-   * <p> For example, this method will find inputs by label "Username" and "Password" in the following DOM:
-   * <pre>{@code
-   * page.getByLabel("Username").fill("john");
-   * page.getByLabel("Password").fill("secret");
-   * }</pre>
-   *
-   * @param text Text to locate the element for.
-   * @since v1.27
-   */
-  Locator getByLabel(Pattern text, GetByLabelOptions options);
-  /**
-   * Allows locating input elements by the placeholder text.
-   *
-   * <p> **Usage**
-   *
-   * <p> For example, consider the following DOM structure.
-   *
-   * <p> You can fill the input after locating it by the placeholder text:
-   * <pre>{@code
-   * page.getByPlaceholder("name@example.com").fill("playwright@microsoft.com");
-   * }</pre>
-   *
-   * @param text Text to locate the element for.
-   * @since v1.27
-   */
-  default Locator getByPlaceholder(String text) {
-    return getByPlaceholder(text, null);
-  }
-  /**
-   * Allows locating input elements by the placeholder text.
-   *
-   * <p> **Usage**
-   *
-   * <p> For example, consider the following DOM structure.
-   *
-   * <p> You can fill the input after locating it by the placeholder text:
-   * <pre>{@code
-   * page.getByPlaceholder("name@example.com").fill("playwright@microsoft.com");
-   * }</pre>
-   *
-   * @param text Text to locate the element for.
-   * @since v1.27
-   */
-  Locator getByPlaceholder(String text, GetByPlaceholderOptions options);
-  /**
-   * Allows locating input elements by the placeholder text.
-   *
-   * <p> **Usage**
-   *
-   * <p> For example, consider the following DOM structure.
-   *
-   * <p> You can fill the input after locating it by the placeholder text:
-   * <pre>{@code
-   * page.getByPlaceholder("name@example.com").fill("playwright@microsoft.com");
-   * }</pre>
-   *
-   * @param text Text to locate the element for.
-   * @since v1.27
-   */
-  default Locator getByPlaceholder(Pattern text) {
-    return getByPlaceholder(text, null);
-  }
-  /**
-   * Allows locating input elements by the placeholder text.
-   *
-   * <p> **Usage**
-   *
-   * <p> For example, consider the following DOM structure.
-   *
-   * <p> You can fill the input after locating it by the placeholder text:
-   * <pre>{@code
-   * page.getByPlaceholder("name@example.com").fill("playwright@microsoft.com");
-   * }</pre>
-   *
-   * @param text Text to locate the element for.
-   * @since v1.27
-   */
-  Locator getByPlaceholder(Pattern text, GetByPlaceholderOptions options);
-  /**
-   * Allows locating elements by their <a href="https://www.w3.org/TR/wai-aria-1.2/#roles">ARIA role</a>, <a
-   * href="https://www.w3.org/TR/wai-aria-1.2/#aria-attributes">ARIA attributes</a> and <a
-   * href="https://w3c.github.io/accname/#dfn-accessible-name">accessible name</a>.
-   *
-   * <p> **Usage**
-   *
-   * <p> Consider the following DOM structure.
-   *
-   * <p> You can locate each element by it's implicit role:
-   * <pre>{@code
-   * assertThat(page
-   *     .getByRole(AriaRole.HEADING,
-   *                new Page.GetByRoleOptions().setName("Sign up")))
-   *     .isVisible();
-   *
-   * page.getByRole(AriaRole.CHECKBOX,
-   *                new Page.GetByRoleOptions().setName("Subscribe"))
-   *     .check();
-   *
-   * page.getByRole(AriaRole.BUTTON,
-   *                new Page.GetByRoleOptions().setName(
-   *                    Pattern.compile("submit", Pattern.CASE_INSENSITIVE)))
-   *     .click();
-   * }</pre>
-   *
-   * <p> **Details**
-   *
-   * <p> Role selector **does not replace** accessibility audits and conformance tests, but rather gives early feedback about the
-   * ARIA guidelines.
-   *
-   * <p> Many html elements have an implicitly <a href="https://w3c.github.io/html-aam/#html-element-role-mappings">defined
-   * role</a> that is recognized by the role selector. You can find all the <a
-   * href="https://www.w3.org/TR/wai-aria-1.2/#role_definitions">supported roles here</a>. ARIA guidelines **do not
-   * recommend** duplicating implicit roles and attributes by setting {@code role} and/or {@code aria-*} attributes to
-   * default values.
-   *
-   * @param role Required aria role.
-   * @since v1.27
-   */
-  default Locator getByRole(AriaRole role) {
-    return getByRole(role, null);
-  }
-  /**
-   * Allows locating elements by their <a href="https://www.w3.org/TR/wai-aria-1.2/#roles">ARIA role</a>, <a
-   * href="https://www.w3.org/TR/wai-aria-1.2/#aria-attributes">ARIA attributes</a> and <a
-   * href="https://w3c.github.io/accname/#dfn-accessible-name">accessible name</a>.
-   *
-   * <p> **Usage**
-   *
-   * <p> Consider the following DOM structure.
-   *
-   * <p> You can locate each element by it's implicit role:
-   * <pre>{@code
-   * assertThat(page
-   *     .getByRole(AriaRole.HEADING,
-   *                new Page.GetByRoleOptions().setName("Sign up")))
-   *     .isVisible();
-   *
-   * page.getByRole(AriaRole.CHECKBOX,
-   *                new Page.GetByRoleOptions().setName("Subscribe"))
-   *     .check();
-   *
-   * page.getByRole(AriaRole.BUTTON,
-   *                new Page.GetByRoleOptions().setName(
-   *                    Pattern.compile("submit", Pattern.CASE_INSENSITIVE)))
-   *     .click();
-   * }</pre>
-   *
-   * <p> **Details**
-   *
-   * <p> Role selector **does not replace** accessibility audits and conformance tests, but rather gives early feedback about the
-   * ARIA guidelines.
-   *
-   * <p> Many html elements have an implicitly <a href="https://w3c.github.io/html-aam/#html-element-role-mappings">defined
-   * role</a> that is recognized by the role selector. You can find all the <a
-   * href="https://www.w3.org/TR/wai-aria-1.2/#role_definitions">supported roles here</a>. ARIA guidelines **do not
-   * recommend** duplicating implicit roles and attributes by setting {@code role} and/or {@code aria-*} attributes to
-   * default values.
-   *
-   * @param role Required aria role.
-   * @since v1.27
-   */
-  Locator getByRole(AriaRole role, GetByRoleOptions options);
-  /**
-   * Locate element by the test id.
-   *
-   * <p> **Usage**
-   *
-   * <p> Consider the following DOM structure.
-   *
-   * <p> You can locate the element by it's test id:
-   * <pre>{@code
-   * page.getByTestId("directions").click();
-   * }</pre>
-   *
-   * <p> **Details**
-   *
-   * <p> By default, the {@code data-testid} attribute is used as a test id. Use {@link Selectors#setTestIdAttribute
-   * Selectors.setTestIdAttribute()} to configure a different test id attribute if necessary.
-   *
-   * @param testId Id to locate the element by.
-   * @since v1.27
-   */
-  Locator getByTestId(String testId);
-  /**
-   * Locate element by the test id.
-   *
-   * <p> **Usage**
-   *
-   * <p> Consider the following DOM structure.
-   *
-   * <p> You can locate the element by it's test id:
-   * <pre>{@code
-   * page.getByTestId("directions").click();
-   * }</pre>
-   *
-   * <p> **Details**
-   *
-   * <p> By default, the {@code data-testid} attribute is used as a test id. Use {@link Selectors#setTestIdAttribute
-   * Selectors.setTestIdAttribute()} to configure a different test id attribute if necessary.
-   *
-   * @param testId Id to locate the element by.
-   * @since v1.27
-   */
-  Locator getByTestId(Pattern testId);
-  /**
-   * Allows locating elements that contain given text.
-   *
-   * <p> See also {@link Locator#filter Locator.filter()} that allows to match by another criteria, like an accessible role, and
-   * then filter by the text content.
-   *
-   * <p> **Usage**
-   *
-   * <p> Consider the following DOM structure:
-   *
-   * <p> You can locate by text substring, exact string, or a regular expression:
-   * <pre>{@code
-   * // Matches <span>
-   * page.getByText("world")
-   *
-   * // Matches first <div>
-   * page.getByText("Hello world")
-   *
-   * // Matches second <div>
-   * page.getByText("Hello", new Page.GetByTextOptions().setExact(true))
-   *
-   * // Matches both <div>s
-   * page.getByText(Pattern.compile("Hello"))
-   *
-   * // Matches second <div>
-   * page.getByText(Pattern.compile("^hello$", Pattern.CASE_INSENSITIVE))
-   * }</pre>
-   *
-   * <p> **Details**
-   *
-   * <p> Matching by text always normalizes whitespace, even with exact match. For example, it turns multiple spaces into one,
-   * turns line breaks into spaces and ignores leading and trailing whitespace.
-   *
-   * <p> Input elements of the type {@code button} and {@code submit} are matched by their {@code value} instead of the text
-   * content. For example, locating by text {@code "Log in"} matches {@code <input type=button value="Log in">}.
-   *
-   * @param text Text to locate the element for.
-   * @since v1.27
-   */
-  default Locator getByText(String text) {
-    return getByText(text, null);
-  }
-  /**
-   * Allows locating elements that contain given text.
-   *
-   * <p> See also {@link Locator#filter Locator.filter()} that allows to match by another criteria, like an accessible role, and
-   * then filter by the text content.
-   *
-   * <p> **Usage**
-   *
-   * <p> Consider the following DOM structure:
-   *
-   * <p> You can locate by text substring, exact string, or a regular expression:
-   * <pre>{@code
-   * // Matches <span>
-   * page.getByText("world")
-   *
-   * // Matches first <div>
-   * page.getByText("Hello world")
-   *
-   * // Matches second <div>
-   * page.getByText("Hello", new Page.GetByTextOptions().setExact(true))
-   *
-   * // Matches both <div>s
-   * page.getByText(Pattern.compile("Hello"))
-   *
-   * // Matches second <div>
-   * page.getByText(Pattern.compile("^hello$", Pattern.CASE_INSENSITIVE))
-   * }</pre>
-   *
-   * <p> **Details**
-   *
-   * <p> Matching by text always normalizes whitespace, even with exact match. For example, it turns multiple spaces into one,
-   * turns line breaks into spaces and ignores leading and trailing whitespace.
-   *
-   * <p> Input elements of the type {@code button} and {@code submit} are matched by their {@code value} instead of the text
-   * content. For example, locating by text {@code "Log in"} matches {@code <input type=button value="Log in">}.
-   *
-   * @param text Text to locate the element for.
-   * @since v1.27
-   */
-  Locator getByText(String text, GetByTextOptions options);
-  /**
-   * Allows locating elements that contain given text.
-   *
-   * <p> See also {@link Locator#filter Locator.filter()} that allows to match by another criteria, like an accessible role, and
-   * then filter by the text content.
-   *
-   * <p> **Usage**
-   *
-   * <p> Consider the following DOM structure:
-   *
-   * <p> You can locate by text substring, exact string, or a regular expression:
-   * <pre>{@code
-   * // Matches <span>
-   * page.getByText("world")
-   *
-   * // Matches first <div>
-   * page.getByText("Hello world")
-   *
-   * // Matches second <div>
-   * page.getByText("Hello", new Page.GetByTextOptions().setExact(true))
-   *
-   * // Matches both <div>s
-   * page.getByText(Pattern.compile("Hello"))
-   *
-   * // Matches second <div>
-   * page.getByText(Pattern.compile("^hello$", Pattern.CASE_INSENSITIVE))
-   * }</pre>
-   *
-   * <p> **Details**
-   *
-   * <p> Matching by text always normalizes whitespace, even with exact match. For example, it turns multiple spaces into one,
-   * turns line breaks into spaces and ignores leading and trailing whitespace.
-   *
-   * <p> Input elements of the type {@code button} and {@code submit} are matched by their {@code value} instead of the text
-   * content. For example, locating by text {@code "Log in"} matches {@code <input type=button value="Log in">}.
-   *
-   * @param text Text to locate the element for.
-   * @since v1.27
-   */
-  default Locator getByText(Pattern text) {
-    return getByText(text, null);
-  }
-  /**
-   * Allows locating elements that contain given text.
-   *
-   * <p> See also {@link Locator#filter Locator.filter()} that allows to match by another criteria, like an accessible role, and
-   * then filter by the text content.
-   *
-   * <p> **Usage**
-   *
-   * <p> Consider the following DOM structure:
-   *
-   * <p> You can locate by text substring, exact string, or a regular expression:
-   * <pre>{@code
-   * // Matches <span>
-   * page.getByText("world")
-   *
-   * // Matches first <div>
-   * page.getByText("Hello world")
-   *
-   * // Matches second <div>
-   * page.getByText("Hello", new Page.GetByTextOptions().setExact(true))
-   *
-   * // Matches both <div>s
-   * page.getByText(Pattern.compile("Hello"))
-   *
-   * // Matches second <div>
-   * page.getByText(Pattern.compile("^hello$", Pattern.CASE_INSENSITIVE))
-   * }</pre>
-   *
-   * <p> **Details**
-   *
-   * <p> Matching by text always normalizes whitespace, even with exact match. For example, it turns multiple spaces into one,
-   * turns line breaks into spaces and ignores leading and trailing whitespace.
-   *
-   * <p> Input elements of the type {@code button} and {@code submit} are matched by their {@code value} instead of the text
-   * content. For example, locating by text {@code "Log in"} matches {@code <input type=button value="Log in">}.
-   *
-   * @param text Text to locate the element for.
-   * @since v1.27
-   */
-  Locator getByText(Pattern text, GetByTextOptions options);
-  /**
-   * Allows locating elements by their title attribute.
-   *
-   * <p> **Usage**
-   *
-   * <p> Consider the following DOM structure.
-   *
-   * <p> You can check the issues count after locating it by the title text:
-   * <pre>{@code
-   * assertThat(page.getByTitle("Issues count")).hasText("25 issues");
-   * }</pre>
-   *
-   * @param text Text to locate the element for.
-   * @since v1.27
-   */
-  default Locator getByTitle(String text) {
-    return getByTitle(text, null);
-  }
-  /**
-   * Allows locating elements by their title attribute.
-   *
-   * <p> **Usage**
-   *
-   * <p> Consider the following DOM structure.
-   *
-   * <p> You can check the issues count after locating it by the title text:
-   * <pre>{@code
-   * assertThat(page.getByTitle("Issues count")).hasText("25 issues");
-   * }</pre>
-   *
-   * @param text Text to locate the element for.
-   * @since v1.27
-   */
-  Locator getByTitle(String text, GetByTitleOptions options);
-  /**
-   * Allows locating elements by their title attribute.
-   *
-   * <p> **Usage**
-   *
-   * <p> Consider the following DOM structure.
-   *
-   * <p> You can check the issues count after locating it by the title text:
-   * <pre>{@code
-   * assertThat(page.getByTitle("Issues count")).hasText("25 issues");
-   * }</pre>
-   *
-   * @param text Text to locate the element for.
-   * @since v1.27
-   */
-  default Locator getByTitle(Pattern text) {
-    return getByTitle(text, null);
-  }
-  /**
-   * Allows locating elements by their title attribute.
-   *
-   * <p> **Usage**
-   *
-   * <p> Consider the following DOM structure.
-   *
-   * <p> You can check the issues count after locating it by the title text:
-   * <pre>{@code
-   * assertThat(page.getByTitle("Issues count")).hasText("25 issues");
-   * }</pre>
-   *
-   * @param text Text to locate the element for.
-   * @since v1.27
-   */
-  Locator getByTitle(Pattern text, GetByTitleOptions options);
   /**
    * Returns locator to the last matching frame.
-   *
-   * @since v1.17
    */
   FrameLocator last();
   /**
-   * The method finds an element matching the specified selector in the locator's subtree. It also accepts filter options,
-   * similar to {@link Locator#filter Locator.filter()} method.
+   * The method finds an element matching the specified selector in the FrameLocator's subtree.
    *
-   * <p> <a href="https://playwright.dev/java/docs/locators">Learn more about locators</a>.
-   *
-   * @param selectorOrLocator A selector or locator to use when resolving DOM element.
-   * @since v1.17
+   * @param selector A selector to use when resolving DOM element. See <a href="https://playwright.dev/java/docs/selectors/">working with
+   * selectors</a> for more details.
    */
-  default Locator locator(String selectorOrLocator) {
-    return locator(selectorOrLocator, null);
-  }
+  Locator locator(String selector);
   /**
-   * The method finds an element matching the specified selector in the locator's subtree. It also accepts filter options,
-   * similar to {@link Locator#filter Locator.filter()} method.
-   *
-   * <p> <a href="https://playwright.dev/java/docs/locators">Learn more about locators</a>.
-   *
-   * @param selectorOrLocator A selector or locator to use when resolving DOM element.
-   * @since v1.17
-   */
-  Locator locator(String selectorOrLocator, LocatorOptions options);
-  /**
-   * The method finds an element matching the specified selector in the locator's subtree. It also accepts filter options,
-   * similar to {@link Locator#filter Locator.filter()} method.
-   *
-   * <p> <a href="https://playwright.dev/java/docs/locators">Learn more about locators</a>.
-   *
-   * @param selectorOrLocator A selector or locator to use when resolving DOM element.
-   * @since v1.17
-   */
-  default Locator locator(Locator selectorOrLocator) {
-    return locator(selectorOrLocator, null);
-  }
-  /**
-   * The method finds an element matching the specified selector in the locator's subtree. It also accepts filter options,
-   * similar to {@link Locator#filter Locator.filter()} method.
-   *
-   * <p> <a href="https://playwright.dev/java/docs/locators">Learn more about locators</a>.
-   *
-   * @param selectorOrLocator A selector or locator to use when resolving DOM element.
-   * @since v1.17
-   */
-  Locator locator(Locator selectorOrLocator, LocatorOptions options);
-  /**
-   * Returns locator to the n-th matching frame. It's zero based, {@code nth(0)} selects the first frame.
-   *
-   * @since v1.17
+   * Returns locator to the n-th matching frame.
    */
   FrameLocator nth(int index);
 }

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

@@ -36,14 +36,10 @@ import java.util.*;
 public interface JSHandle {
   /**
    * Returns either {@code null} or the object handle itself, if the object handle is an instance of {@code ElementHandle}.
-   *
-   * @since v1.8
    */
   ElementHandle asElement();
   /**
    * The {@code jsHandle.dispose} method stops referencing the element handle.
-   *
-   * @since v1.8
    */
   void dispose();
   /**
@@ -52,18 +48,17 @@ public interface JSHandle {
    * <p> This method passes this handle as the first argument to {@code expression}.
    *
    * <p> If {@code expression} returns a <a
-   * href='https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise'>Promise</a>, then {@code
-   * handle.evaluate} would wait for the promise to resolve and return its value.
+   * href='https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise'>Promise</a>, then
+   * {@code handle.evaluate} would wait for the promise to resolve and return its value.
    *
-   * <p> **Usage**
+   * <p> Examples:
    * <pre>{@code
    * ElementHandle tweetHandle = page.querySelector(".tweet .retweets");
    * assertEquals("10 retweets", tweetHandle.evaluate("node => node.innerText"));
    * }</pre>
    *
-   * @param expression JavaScript expression to be evaluated in the browser context. If the expression evaluates to a function, the function is
-   * automatically invoked.
-   * @since v1.8
+   * @param expression JavaScript expression to be evaluated in the browser context. If it looks like a function declaration, it is interpreted
+   * as a function. Otherwise, evaluated as an expression.
    */
   default Object evaluate(String expression) {
     return evaluate(expression, null);
@@ -74,19 +69,18 @@ public interface JSHandle {
    * <p> This method passes this handle as the first argument to {@code expression}.
    *
    * <p> If {@code expression} returns a <a
-   * href='https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise'>Promise</a>, then {@code
-   * handle.evaluate} would wait for the promise to resolve and return its value.
+   * href='https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise'>Promise</a>, then
+   * {@code handle.evaluate} would wait for the promise to resolve and return its value.
    *
-   * <p> **Usage**
+   * <p> Examples:
    * <pre>{@code
    * ElementHandle tweetHandle = page.querySelector(".tweet .retweets");
    * assertEquals("10 retweets", tweetHandle.evaluate("node => node.innerText"));
    * }</pre>
    *
-   * @param expression JavaScript expression to be evaluated in the browser context. If the expression evaluates to a function, the function is
-   * automatically invoked.
+   * @param expression JavaScript expression to be evaluated in the browser context. If it looks like a function declaration, it is interpreted
+   * as a function. Otherwise, evaluated as an expression.
    * @param arg Optional argument to pass to {@code expression}.
-   * @since v1.8
    */
   Object evaluate(String expression, Object arg);
   /**
@@ -94,18 +88,17 @@ public interface JSHandle {
    *
    * <p> This method passes this handle as the first argument to {@code expression}.
    *
-   * <p> The only difference between {@code jsHandle.evaluate} and {@code jsHandle.evaluateHandle} is that {@code
-   * jsHandle.evaluateHandle} returns {@code JSHandle}.
+   * <p> The only difference between {@code jsHandle.evaluate} and {@code jsHandle.evaluateHandle} is that {@code jsHandle.evaluateHandle} returns
+   * {@code JSHandle}.
    *
    * <p> If the function passed to the {@code jsHandle.evaluateHandle} returns a <a
-   * href='https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise'>Promise</a>, then {@code
-   * jsHandle.evaluateHandle} would wait for the promise to resolve and return its value.
+   * href='https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise'>Promise</a>, then
+   * {@code jsHandle.evaluateHandle} would wait for the promise to resolve and return its value.
    *
    * <p> See {@link Page#evaluateHandle Page.evaluateHandle()} for more details.
    *
-   * @param expression JavaScript expression to be evaluated in the browser context. If the expression evaluates to a function, the function is
-   * automatically invoked.
-   * @since v1.8
+   * @param expression JavaScript expression to be evaluated in the browser context. If it looks like a function declaration, it is interpreted
+   * as a function. Otherwise, evaluated as an expression.
    */
   default JSHandle evaluateHandle(String expression) {
     return evaluateHandle(expression, null);
@@ -115,41 +108,35 @@ public interface JSHandle {
    *
    * <p> This method passes this handle as the first argument to {@code expression}.
    *
-   * <p> The only difference between {@code jsHandle.evaluate} and {@code jsHandle.evaluateHandle} is that {@code
-   * jsHandle.evaluateHandle} returns {@code JSHandle}.
+   * <p> The only difference between {@code jsHandle.evaluate} and {@code jsHandle.evaluateHandle} is that {@code jsHandle.evaluateHandle} returns
+   * {@code JSHandle}.
    *
    * <p> If the function passed to the {@code jsHandle.evaluateHandle} returns a <a
-   * href='https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise'>Promise</a>, then {@code
-   * jsHandle.evaluateHandle} would wait for the promise to resolve and return its value.
+   * href='https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise'>Promise</a>, then
+   * {@code jsHandle.evaluateHandle} would wait for the promise to resolve and return its value.
    *
    * <p> See {@link Page#evaluateHandle Page.evaluateHandle()} for more details.
    *
-   * @param expression JavaScript expression to be evaluated in the browser context. If the expression evaluates to a function, the function is
-   * automatically invoked.
+   * @param expression JavaScript expression to be evaluated in the browser context. If it looks like a function declaration, it is interpreted
+   * as a function. Otherwise, evaluated as an expression.
    * @param arg Optional argument to pass to {@code expression}.
-   * @since v1.8
    */
   JSHandle evaluateHandle(String expression, Object arg);
   /**
    * The method returns a map with **own property names** as keys and JSHandle instances for the property values.
-   *
-   * <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");
    * handle.dispose();
    * }</pre>
-   *
-   * @since v1.8
    */
   Map<String, JSHandle> getProperties();
   /**
    * Fetches a single property from the referenced object.
    *
    * @param propertyName property to get
-   * @since v1.8
    */
   JSHandle getProperty(String propertyName);
   /**
@@ -157,8 +144,6 @@ public interface JSHandle {
    *
    * <p> <strong>NOTE:</strong> The method will return an empty JSON object if the referenced object is not stringifiable. It will throw an error if the
    * object has circular references.
-   *
-   * @since v1.8
    */
   Object jsonValue();
 }

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

@@ -17,11 +17,11 @@
 package com.microsoft.playwright;
 
 import com.microsoft.playwright.options.*;
+import java.util.*;
 
 /**
  * Keyboard provides an api for managing a virtual keyboard. The high level api is {@link Keyboard#type Keyboard.type()},
- * which takes raw characters and generates proper {@code keydown}, {@code keypress}/{@code input}, and {@code keyup}
- * events on your page.
+ * which takes raw characters and generates proper keydown, keypress/input, and keyup events on your page.
  *
  * <p> For finer control, you can use {@link Keyboard#down Keyboard.down()}, {@link Keyboard#up Keyboard.up()}, and {@link
  * Keyboard#insertText Keyboard.insertText()} to manually fire events as if they were generated from a real keyboard.
@@ -90,21 +90,18 @@ public interface Keyboard {
    * character to generate the text for. A superset of the {@code key} values can be found <a
    * href="https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key/Key_Values">here</a>. Examples of the keys are:
    *
-   * <p> {@code F1} - {@code F12}, {@code Digit0}- {@code Digit9}, {@code KeyA}- {@code KeyZ}, {@code Backquote}, {@code Minus},
-   * {@code Equal}, {@code Backslash}, {@code Backspace}, {@code Tab}, {@code Delete}, {@code Escape}, {@code ArrowDown},
-   * {@code End}, {@code Enter}, {@code Home}, {@code Insert}, {@code PageDown}, {@code PageUp}, {@code ArrowRight}, {@code
-   * ArrowUp}, etc.
+   * <p> {@code F1} - {@code F12}, {@code Digit0}- {@code Digit9}, {@code KeyA}- {@code KeyZ}, {@code Backquote}, {@code Minus}, {@code Equal}, {@code Backslash}, {@code Backspace}, {@code Tab},
+   * {@code Delete}, {@code Escape}, {@code ArrowDown}, {@code End}, {@code Enter}, {@code Home}, {@code Insert}, {@code PageDown}, {@code PageUp}, {@code ArrowRight}, {@code ArrowUp}, etc.
    *
-   * <p> Following modification shortcuts are also supported: {@code Shift}, {@code Control}, {@code Alt}, {@code Meta}, {@code
-   * ShiftLeft}.
+   * <p> Following modification shortcuts are also supported: {@code Shift}, {@code Control}, {@code Alt}, {@code Meta}, {@code ShiftLeft}.
    *
    * <p> Holding down {@code Shift} will type the text that corresponds to the {@code key} in the upper case.
    *
-   * <p> If {@code key} is a single character, it is case-sensitive, so the values {@code a} and {@code A} will generate
-   * different respective texts.
+   * <p> If {@code key} is a single character, it is case-sensitive, so the values {@code a} and {@code A} will generate different respective
+   * texts.
    *
-   * <p> If {@code key} is a modifier key, {@code Shift}, {@code Meta}, {@code Control}, or {@code Alt}, subsequent key presses
-   * will be sent with that modifier active. To release the modifier key, use {@link Keyboard#up Keyboard.up()}.
+   * <p> If {@code key} is a modifier key, {@code Shift}, {@code Meta}, {@code Control}, or {@code Alt}, subsequent key presses will be sent with that modifier
+   * active. To release the modifier key, use {@link Keyboard#up Keyboard.up()}.
    *
    * <p> After the key is pressed once, subsequent calls to {@link Keyboard#down Keyboard.down()} will have <a
    * href="https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/repeat">repeat</a> set to true. To release the key,
@@ -113,22 +110,17 @@ public interface Keyboard {
    * <p> <strong>NOTE:</strong> Modifier keys DO influence {@code keyboard.down}. Holding down {@code Shift} will type the text in upper case.
    *
    * @param key Name of the key to press or a character to generate, such as {@code ArrowLeft} or {@code a}.
-   * @since v1.8
    */
   void down(String key);
   /**
    * Dispatches only {@code input} event, does not emit the {@code keydown}, {@code keyup} or {@code keypress} events.
-   *
-   * <p> **Usage**
    * <pre>{@code
    * page.keyboard().insertText("嗨");
    * }</pre>
    *
-   * <p> <strong>NOTE:</strong> Modifier keys DO NOT effect {@code keyboard.insertText}. Holding down {@code Shift} will not type the text in upper
-   * case.
+   * <p> <strong>NOTE:</strong> Modifier keys DO NOT effect {@code keyboard.insertText}. Holding down {@code Shift} will not type the text in upper case.
    *
    * @param text Sets input to the specified text value.
-   * @since v1.8
    */
   void insertText(String text);
   /**
@@ -137,23 +129,18 @@ public interface Keyboard {
    * character to generate the text for. A superset of the {@code key} values can be found <a
    * href="https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key/Key_Values">here</a>. Examples of the keys are:
    *
-   * <p> {@code F1} - {@code F12}, {@code Digit0}- {@code Digit9}, {@code KeyA}- {@code KeyZ}, {@code Backquote}, {@code Minus},
-   * {@code Equal}, {@code Backslash}, {@code Backspace}, {@code Tab}, {@code Delete}, {@code Escape}, {@code ArrowDown},
-   * {@code End}, {@code Enter}, {@code Home}, {@code Insert}, {@code PageDown}, {@code PageUp}, {@code ArrowRight}, {@code
-   * ArrowUp}, etc.
+   * <p> {@code F1} - {@code F12}, {@code Digit0}- {@code Digit9}, {@code KeyA}- {@code KeyZ}, {@code Backquote}, {@code Minus}, {@code Equal}, {@code Backslash}, {@code Backspace}, {@code Tab},
+   * {@code Delete}, {@code Escape}, {@code ArrowDown}, {@code End}, {@code Enter}, {@code Home}, {@code Insert}, {@code PageDown}, {@code PageUp}, {@code ArrowRight}, {@code ArrowUp}, etc.
    *
-   * <p> Following modification shortcuts are also supported: {@code Shift}, {@code Control}, {@code Alt}, {@code Meta}, {@code
-   * ShiftLeft}.
+   * <p> Following modification shortcuts are also supported: {@code Shift}, {@code Control}, {@code Alt}, {@code Meta}, {@code ShiftLeft}.
    *
    * <p> Holding down {@code Shift} will type the text that corresponds to the {@code key} in the upper case.
    *
-   * <p> If {@code key} is a single character, it is case-sensitive, so the values {@code a} and {@code A} will generate
-   * different respective texts.
+   * <p> If {@code key} is a single character, it is case-sensitive, so the values {@code a} and {@code A} will generate different respective
+   * texts.
    *
-   * <p> Shortcuts such as {@code key: "Control+o"} or {@code key: "Control+Shift+T"} are supported as well. When specified with
-   * the modifier, modifier is pressed and being held while the subsequent key is being pressed.
-   *
-   * <p> **Usage**
+   * <p> Shortcuts such as {@code key: "Control+o"} or {@code key: "Control+Shift+T"} are supported as well. When specified with the
+   * modifier, modifier is pressed and being held while the subsequent key is being pressed.
    * <pre>{@code
    * Page page = browser.newPage();
    * page.navigate("https://keycode.info");
@@ -169,7 +156,6 @@ public interface Keyboard {
    * <p> Shortcut for {@link Keyboard#down Keyboard.down()} and {@link Keyboard#up Keyboard.up()}.
    *
    * @param key Name of the key to press or a character to generate, such as {@code ArrowLeft} or {@code a}.
-   * @since v1.8
    */
   default void press(String key) {
     press(key, null);
@@ -180,23 +166,18 @@ public interface Keyboard {
    * character to generate the text for. A superset of the {@code key} values can be found <a
    * href="https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key/Key_Values">here</a>. Examples of the keys are:
    *
-   * <p> {@code F1} - {@code F12}, {@code Digit0}- {@code Digit9}, {@code KeyA}- {@code KeyZ}, {@code Backquote}, {@code Minus},
-   * {@code Equal}, {@code Backslash}, {@code Backspace}, {@code Tab}, {@code Delete}, {@code Escape}, {@code ArrowDown},
-   * {@code End}, {@code Enter}, {@code Home}, {@code Insert}, {@code PageDown}, {@code PageUp}, {@code ArrowRight}, {@code
-   * ArrowUp}, etc.
+   * <p> {@code F1} - {@code F12}, {@code Digit0}- {@code Digit9}, {@code KeyA}- {@code KeyZ}, {@code Backquote}, {@code Minus}, {@code Equal}, {@code Backslash}, {@code Backspace}, {@code Tab},
+   * {@code Delete}, {@code Escape}, {@code ArrowDown}, {@code End}, {@code Enter}, {@code Home}, {@code Insert}, {@code PageDown}, {@code PageUp}, {@code ArrowRight}, {@code ArrowUp}, etc.
    *
-   * <p> Following modification shortcuts are also supported: {@code Shift}, {@code Control}, {@code Alt}, {@code Meta}, {@code
-   * ShiftLeft}.
+   * <p> Following modification shortcuts are also supported: {@code Shift}, {@code Control}, {@code Alt}, {@code Meta}, {@code ShiftLeft}.
    *
    * <p> Holding down {@code Shift} will type the text that corresponds to the {@code key} in the upper case.
    *
-   * <p> If {@code key} is a single character, it is case-sensitive, so the values {@code a} and {@code A} will generate
-   * different respective texts.
+   * <p> If {@code key} is a single character, it is case-sensitive, so the values {@code a} and {@code A} will generate different respective
+   * texts.
    *
-   * <p> Shortcuts such as {@code key: "Control+o"} or {@code key: "Control+Shift+T"} are supported as well. When specified with
-   * the modifier, modifier is pressed and being held while the subsequent key is being pressed.
-   *
-   * <p> **Usage**
+   * <p> Shortcuts such as {@code key: "Control+o"} or {@code key: "Control+Shift+T"} are supported as well. When specified with the
+   * modifier, modifier is pressed and being held while the subsequent key is being pressed.
    * <pre>{@code
    * Page page = browser.newPage();
    * page.navigate("https://keycode.info");
@@ -212,15 +193,12 @@ public interface Keyboard {
    * <p> Shortcut for {@link Keyboard#down Keyboard.down()} and {@link Keyboard#up Keyboard.up()}.
    *
    * @param key Name of the key to press or a character to generate, such as {@code ArrowLeft} or {@code a}.
-   * @since v1.8
    */
   void press(String key, PressOptions options);
   /**
    * Sends a {@code keydown}, {@code keypress}/{@code input}, and {@code keyup} event for each character in the text.
    *
    * <p> To press a special key, like {@code Control} or {@code ArrowDown}, use {@link Keyboard#press Keyboard.press()}.
-   *
-   * <p> **Usage**
    * <pre>{@code
    * // Types instantly
    * page.keyboard().type("Hello");
@@ -233,7 +211,6 @@ public interface Keyboard {
    * <p> <strong>NOTE:</strong> For characters that are not on a US keyboard, only an {@code input} event will be sent.
    *
    * @param text A text to type into a focused element.
-   * @since v1.8
    */
   default void type(String text) {
     type(text, null);
@@ -242,8 +219,6 @@ public interface Keyboard {
    * Sends a {@code keydown}, {@code keypress}/{@code input}, and {@code keyup} event for each character in the text.
    *
    * <p> To press a special key, like {@code Control} or {@code ArrowDown}, use {@link Keyboard#press Keyboard.press()}.
-   *
-   * <p> **Usage**
    * <pre>{@code
    * // Types instantly
    * page.keyboard().type("Hello");
@@ -256,14 +231,12 @@ public interface Keyboard {
    * <p> <strong>NOTE:</strong> For characters that are not on a US keyboard, only an {@code input} event will be sent.
    *
    * @param text A text to type into a focused element.
-   * @since v1.8
    */
   void type(String text, TypeOptions options);
   /**
    * Dispatches a {@code keyup} event.
    *
    * @param key Name of the key to press or a character to generate, such as {@code ArrowLeft} or {@code a}.
-   * @since v1.8
    */
   void up(String key);
 }

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

@@ -17,6 +17,7 @@
 package com.microsoft.playwright;
 
 import com.microsoft.playwright.options.*;
+import java.util.*;
 
 /**
  * The Mouse class operates in main-frame CSS pixels relative to the top-left corner of the viewport.
@@ -122,12 +123,12 @@ public interface Mouse {
   }
   class MoveOptions {
     /**
-     * Defaults to 1. Sends intermediate {@code mousemove} events.
+     * defaults to 1. Sends intermediate {@code mousemove} events.
      */
     public Integer steps;
 
     /**
-     * Defaults to 1. Sends intermediate {@code mousemove} events.
+     * defaults to 1. Sends intermediate {@code mousemove} events.
      */
     public MoveOptions setSteps(int steps) {
       this.steps = steps;
@@ -161,23 +162,17 @@ public interface Mouse {
   }
   /**
    * Shortcut for {@link Mouse#move Mouse.move()}, {@link Mouse#down Mouse.down()}, {@link Mouse#up Mouse.up()}.
-   *
-   * @since v1.8
    */
   default void click(double x, double y) {
     click(x, y, null);
   }
   /**
    * Shortcut for {@link Mouse#move Mouse.move()}, {@link Mouse#down Mouse.down()}, {@link Mouse#up Mouse.up()}.
-   *
-   * @since v1.8
    */
   void click(double x, double y, ClickOptions options);
   /**
    * Shortcut for {@link Mouse#move Mouse.move()}, {@link Mouse#down Mouse.down()}, {@link Mouse#up Mouse.up()}, {@link
    * Mouse#down Mouse.down()} and {@link Mouse#up Mouse.up()}.
-   *
-   * @since v1.8
    */
   default void dblclick(double x, double y) {
     dblclick(x, y, null);
@@ -185,50 +180,36 @@ public interface Mouse {
   /**
    * Shortcut for {@link Mouse#move Mouse.move()}, {@link Mouse#down Mouse.down()}, {@link Mouse#up Mouse.up()}, {@link
    * Mouse#down Mouse.down()} and {@link Mouse#up Mouse.up()}.
-   *
-   * @since v1.8
    */
   void dblclick(double x, double y, DblclickOptions options);
   /**
    * Dispatches a {@code mousedown} event.
-   *
-   * @since v1.8
    */
   default void down() {
     down(null);
   }
   /**
    * Dispatches a {@code mousedown} event.
-   *
-   * @since v1.8
    */
   void down(DownOptions options);
   /**
    * Dispatches a {@code mousemove} event.
-   *
-   * @since v1.8
    */
   default void move(double x, double y) {
     move(x, y, null);
   }
   /**
    * Dispatches a {@code mousemove} event.
-   *
-   * @since v1.8
    */
   void move(double x, double y, MoveOptions options);
   /**
    * Dispatches a {@code mouseup} event.
-   *
-   * @since v1.8
    */
   default void up() {
     up(null);
   }
   /**
    * Dispatches a {@code mouseup} event.
-   *
-   * @since v1.8
    */
   void up(UpOptions options);
   /**
@@ -239,7 +220,6 @@ public interface Mouse {
    *
    * @param deltaX Pixels to scroll horizontally.
    * @param deltaY Pixels to scroll vertically.
-   * @since v1.15
    */
   void wheel(double deltaX, double deltaY);
 }

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

@@ -58,53 +58,35 @@ public interface Playwright extends AutoCloseable {
   }
   /**
    * This object can be used to launch or connect to Chromium, returning instances of {@code Browser}.
-   *
-   * @since v1.8
    */
   BrowserType chromium();
   /**
    * This object can be used to launch or connect to Firefox, returning instances of {@code Browser}.
-   *
-   * @since v1.8
    */
   BrowserType firefox();
-  /**
-   * Exposes API that can be used for the Web API testing.
-   *
-   * @since v1.16
-   */
-  APIRequest request();
   /**
    * Selectors can be used to install custom selector engines. See <a
-   * href="https://playwright.dev/java/docs/extensibility">extensibility</a> for more information.
-   *
-   * @since v1.8
+   * href="https://playwright.dev/java/docs/selectors/">Working with selectors</a> for more information.
    */
   Selectors selectors();
   /**
    * This object can be used to launch or connect to WebKit, returning instances of {@code Browser}.
-   *
-   * @since v1.8
    */
   BrowserType webkit();
   /**
    * Terminates this instance of Playwright, will also close all created browsers if they are still running.
-   *
-   * @since v1.9
    */
   void close();
   /**
    * Launches new Playwright driver process and connects to it. {@link Playwright#close Playwright.close()} should be called
    * when the instance is no longer needed.
    * <pre>{@code
-   * Playwright playwright = Playwright.create();
+   * Playwright playwright = Playwright.create()) {
    * Browser browser = playwright.webkit().launch();
    * Page page = browser.newPage();
    * page.navigate("https://www.w3.org/");
    * playwright.close();
    * }</pre>
-   *
-   * @since v1.10
    */
   static Playwright create(CreateOptions options) {
     return PlaywrightImpl.create(options);

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

@@ -28,98 +28,74 @@ import java.util.*;
  * complete.</li>
  * </ul>
  *
- * <p> If request fails at some point, then instead of {@code "requestfinished"} event (and possibly instead of 'response'
- * event), the  {@link Page#onRequestFailed Page.onRequestFailed()} event is emitted.
+ * <p> If request fails at some point, then instead of {@code "requestfinished"} event (and possibly instead of 'response' event),
+ * the  {@link Page#onRequestFailed Page.onRequestFailed()} event is emitted.
  *
  * <p> <strong>NOTE:</strong> HTTP Error responses, such as 404 or 503, are still successful responses from HTTP standpoint, so request will complete
  * with {@code "requestfinished"} event.
  *
- * <p> If request gets a 'redirect' response, the request is successfully finished with the {@code requestfinished} event, and
- * a new request is  issued to a redirected url.
+ * <p> If request gets a 'redirect' response, the request is successfully finished with the 'requestfinished' event, and a new
+ * request is  issued to a redirected url.
  */
 public interface Request {
   /**
    * An object with all the request HTTP headers associated with this request. The header names are lower-cased.
-   *
-   * @since v1.15
    */
   Map<String, String> allHeaders();
   /**
    * The method returns {@code null} unless this request has failed, as reported by {@code requestfailed} event.
    *
-   * <p> **Usage**
-   *
    * <p> Example of logging of all the failed requests:
    * <pre>{@code
    * page.onRequestFailed(request -> {
    *   System.out.println(request.url() + " " + request.failure());
    * });
    * }</pre>
-   *
-   * @since v1.8
    */
   String failure();
   /**
    * Returns the {@code Frame} that initiated this request.
-   *
-   * @since v1.8
    */
   Frame frame();
   /**
-   * An object with the request HTTP headers. The header names are lower-cased. Note that this method does not return
-   * security-related headers, including cookie-related ones. You can use {@link Request#allHeaders Request.allHeaders()} for
-   * complete list of headers that include {@code cookie} information.
-   *
-   * @since v1.8
+   * **DEPRECATED** Incomplete list of headers as seen by the rendering engine. Use {@link Request#allHeaders
+   * Request.allHeaders()} instead.
    */
   Map<String, String> headers();
   /**
    * An array with all the request HTTP headers associated with this request. Unlike {@link Request#allHeaders
-   * Request.allHeaders()}, header names are NOT lower-cased. Headers with multiple entries, such as {@code Set-Cookie},
-   * appear in the array multiple times.
-   *
-   * @since v1.15
+   * Request.allHeaders()}, header names are NOT lower-cased. Headers with multiple entries, such as {@code Set-Cookie}, appear in
+   * the array multiple times.
    */
   List<HttpHeader> headersArray();
   /**
    * Returns the value of the header matching the name. The name is case insensitive.
    *
    * @param name Name of the header.
-   * @since v1.15
    */
   String headerValue(String name);
   /**
    * Whether this request is driving frame's navigation.
-   *
-   * @since v1.8
    */
   boolean isNavigationRequest();
   /**
    * Request's method (GET, POST, etc.)
-   *
-   * @since v1.8
    */
   String method();
   /**
    * Request's post body, if any.
-   *
-   * @since v1.8
    */
   String postData();
   /**
    * Request's post body in a binary form, if any.
-   *
-   * @since v1.8
    */
   byte[] postDataBuffer();
   /**
    * Request that was redirected by the server to this one, if any.
    *
-   * <p> When the server responds with a redirect, Playwright creates a new {@code Request} object. The two requests are
-   * connected by {@code redirectedFrom()} and {@code redirectedTo()} methods. When multiple server redirects has happened,
-   * it is possible to construct the whole redirect chain by repeatedly calling {@code redirectedFrom()}.
-   *
-   * <p> **Usage**
+   * <p> When the server responds with a redirect, Playwright creates a new {@code Request} object. The two requests are connected by
+   * {@code redirectedFrom()} and {@code redirectedTo()} methods. When multiple server redirects has happened, it is possible to
+   * construct the whole redirect chain by repeatedly calling {@code redirectedFrom()}.
    *
    * <p> For example, if the website {@code http://example.com} redirects to {@code https://example.com}:
    * <pre>{@code
@@ -132,49 +108,35 @@ public interface Request {
    * Response response = page.navigate("https://google.com");
    * System.out.println(response.request().redirectedFrom()); // null
    * }</pre>
-   *
-   * @since v1.8
    */
   Request redirectedFrom();
   /**
    * New request issued by the browser if the server responded with redirect.
    *
-   * <p> **Usage**
-   *
    * <p> This method is the opposite of {@link Request#redirectedFrom Request.redirectedFrom()}:
    * <pre>{@code
    * System.out.println(request.redirectedFrom().redirectedTo() == request); // true
    * }</pre>
-   *
-   * @since v1.8
    */
   Request redirectedTo();
   /**
    * Contains the request's resource type as it was perceived by the rendering engine. ResourceType will be one of the
-   * following: {@code document}, {@code stylesheet}, {@code image}, {@code media}, {@code font}, {@code script}, {@code
-   * texttrack}, {@code xhr}, {@code fetch}, {@code eventsource}, {@code websocket}, {@code manifest}, {@code other}.
-   *
-   * @since v1.8
+   * following: {@code document}, {@code stylesheet}, {@code image}, {@code media}, {@code font}, {@code script}, {@code texttrack}, {@code xhr}, {@code fetch}, {@code eventsource},
+   * {@code websocket}, {@code manifest}, {@code other}.
    */
   String resourceType();
   /**
    * Returns the matching {@code Response} object, or {@code null} if the response was not received due to error.
-   *
-   * @since v1.8
    */
   Response response();
   /**
    * Returns resource size information for given request.
-   *
-   * @since v1.15
    */
   Sizes sizes();
   /**
    * Returns resource timing information for given request. Most of the timing values become available upon the response,
    * {@code responseEnd} becomes available when request finishes. Find more information at <a
    * href="https://developer.mozilla.org/en-US/docs/Web/API/PerformanceResourceTiming">Resource Timing API</a>.
-   *
-   * <p> **Usage**
    * <pre>{@code
    * page.onRequestFinished(request -> {
    *   Timing timing = request.timing();
@@ -182,14 +144,10 @@ public interface Request {
    * });
    * page.navigate("http://example.com");
    * }</pre>
-   *
-   * @since v1.8
    */
   Timing timing();
   /**
    * URL of the request.
-   *
-   * @since v1.8
    */
   String url();
 }

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

@@ -25,113 +25,75 @@ import java.util.*;
 public interface Response {
   /**
    * An object with all the response HTTP headers associated with this response.
-   *
-   * @since v1.15
    */
   Map<String, String> allHeaders();
   /**
    * Returns the buffer with response body.
-   *
-   * @since v1.8
    */
   byte[] body();
   /**
    * Waits for this response to finish, returns always {@code null}.
-   *
-   * @since v1.8
    */
   String finished();
   /**
    * Returns the {@code Frame} that initiated this response.
-   *
-   * @since v1.8
    */
   Frame frame();
   /**
-   * Indicates whether this Response was fulfilled by a Service Worker's Fetch Handler (i.e. via <a
-   * href="https://developer.mozilla.org/en-US/docs/Web/API/FetchEvent/respondWith">FetchEvent.respondWith</a>).
-   *
-   * @since v1.23
-   */
-  boolean fromServiceWorker();
-  /**
-   * An object with the response HTTP headers. The header names are lower-cased. Note that this method does not return
-   * security-related headers, including cookie-related ones. You can use {@link Response#allHeaders Response.allHeaders()}
-   * for complete list of headers that include {@code cookie} information.
-   *
-   * @since v1.8
+   * **DEPRECATED** Incomplete list of headers as seen by the rendering engine. Use {@link Response#allHeaders
+   * Response.allHeaders()} instead.
    */
   Map<String, String> headers();
   /**
    * An array with all the request HTTP headers associated with this response. Unlike {@link Response#allHeaders
-   * Response.allHeaders()}, header names are NOT lower-cased. Headers with multiple entries, such as {@code Set-Cookie},
-   * appear in the array multiple times.
-   *
-   * @since v1.15
+   * Response.allHeaders()}, header names are NOT lower-cased. Headers with multiple entries, such as {@code Set-Cookie}, appear in
+   * the array multiple times.
    */
   List<HttpHeader> headersArray();
   /**
    * Returns the value of the header matching the name. The name is case insensitive. If multiple headers have the same name
-   * (except {@code set-cookie}), they are returned as a list separated by {@code , }. For {@code set-cookie}, the {@code \n}
-   * separator is used. If no headers are found, {@code null} is returned.
+   * (except {@code set-cookie}), they are returned as a list separated by {@code , }. For {@code set-cookie}, the {@code \n} separator is used. If
+   * no headers are found, {@code null} is returned.
    *
    * @param name Name of the header.
-   * @since v1.15
    */
   String headerValue(String name);
   /**
    * Returns all values of the headers matching the name, for example {@code set-cookie}. The name is case insensitive.
    *
    * @param name Name of the header.
-   * @since v1.15
    */
   List<String> headerValues(String name);
   /**
    * Contains a boolean stating whether the response was successful (status in the range 200-299) or not.
-   *
-   * @since v1.8
    */
   boolean ok();
   /**
    * Returns the matching {@code Request} object.
-   *
-   * @since v1.8
    */
   Request request();
   /**
    * Returns SSL and other security information.
-   *
-   * @since v1.13
    */
   SecurityDetails securityDetails();
   /**
    * Returns the IP address and port of the server.
-   *
-   * @since v1.13
    */
   ServerAddr serverAddr();
   /**
    * Contains the status code of the response (e.g., 200 for a success).
-   *
-   * @since v1.8
    */
   int status();
   /**
    * Contains the status text of the response (e.g. usually an "OK" for a success).
-   *
-   * @since v1.8
    */
   String statusText();
   /**
    * Returns the text representation of response body.
-   *
-   * @since v1.8
    */
   String text();
   /**
    * Contains the URL of the response.
-   *
-   * @since v1.8
    */
   String url();
 }

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

@@ -16,14 +16,13 @@
 
 package com.microsoft.playwright;
 
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.util.*;
 
 /**
  * Whenever a network route is set up with {@link Page#route Page.route()} or {@link BrowserContext#route
  * BrowserContext.route()}, the {@code Route} object allows to handle the route.
- *
- * <p> Learn more about <a href="https://playwright.dev/java/docs/network">networking</a>.
  */
 public interface Route {
   class ResumeOptions {
@@ -32,11 +31,11 @@ public interface Route {
      */
     public Map<String, String> headers;
     /**
-     * If set changes the request method (e.g. GET or POST).
+     * If set changes the request method (e.g. GET or POST)
      */
     public String method;
     /**
-     * If set changes the post data of request.
+     * If set changes the post data of request
      */
     public Object postData;
     /**
@@ -52,21 +51,21 @@ public interface Route {
       return this;
     }
     /**
-     * If set changes the request method (e.g. GET or POST).
+     * If set changes the request method (e.g. GET or POST)
      */
     public ResumeOptions setMethod(String method) {
       this.method = method;
       return this;
     }
     /**
-     * If set changes the post data of request.
+     * If set changes the post data of request
      */
     public ResumeOptions setPostData(String postData) {
       this.postData = postData;
       return this;
     }
     /**
-     * If set changes the post data of request.
+     * If set changes the post data of request
      */
     public ResumeOptions setPostData(byte[] postData) {
       this.postData = postData;
@@ -80,140 +79,6 @@ public interface Route {
       return this;
     }
   }
-  class FallbackOptions {
-    /**
-     * If set changes the request HTTP headers. Header values will be converted to a string.
-     */
-    public Map<String, String> headers;
-    /**
-     * If set changes the request method (e.g. GET or POST).
-     */
-    public String method;
-    /**
-     * If set changes the post data of request.
-     */
-    public Object postData;
-    /**
-     * If set changes the request URL. New URL must have same protocol as original one. Changing the URL won't affect the route
-     * matching, all the routes are matched using the original request URL.
-     */
-    public String url;
-
-    /**
-     * If set changes the request HTTP headers. Header values will be converted to a string.
-     */
-    public FallbackOptions setHeaders(Map<String, String> headers) {
-      this.headers = headers;
-      return this;
-    }
-    /**
-     * If set changes the request method (e.g. GET or POST).
-     */
-    public FallbackOptions setMethod(String method) {
-      this.method = method;
-      return this;
-    }
-    /**
-     * If set changes the post data of request.
-     */
-    public FallbackOptions setPostData(String postData) {
-      this.postData = postData;
-      return this;
-    }
-    /**
-     * If set changes the post data of request.
-     */
-    public FallbackOptions setPostData(byte[] postData) {
-      this.postData = postData;
-      return this;
-    }
-    /**
-     * If set changes the request URL. New URL must have same protocol as original one. Changing the URL won't affect the route
-     * matching, all the routes are matched using the original request URL.
-     */
-    public FallbackOptions setUrl(String url) {
-      this.url = url;
-      return this;
-    }
-  }
-  class FetchOptions {
-    /**
-     * If set changes the request HTTP headers. Header values will be converted to a string.
-     */
-    public Map<String, String> headers;
-    /**
-     * Maximum number of request redirects that will be followed automatically. An error will be thrown if the number is
-     * exceeded. Defaults to {@code 20}. Pass {@code 0} to not follow redirects.
-     */
-    public Integer maxRedirects;
-    /**
-     * If set changes the request method (e.g. GET or POST).
-     */
-    public String method;
-    /**
-     * If set changes the post data of request.
-     */
-    public Object postData;
-    /**
-     * Request timeout in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout.
-     */
-    public Double timeout;
-    /**
-     * If set changes the request URL. New URL must have same protocol as original one.
-     */
-    public String url;
-
-    /**
-     * If set changes the request HTTP headers. Header values will be converted to a string.
-     */
-    public FetchOptions setHeaders(Map<String, String> headers) {
-      this.headers = headers;
-      return this;
-    }
-    /**
-     * Maximum number of request redirects that will be followed automatically. An error will be thrown if the number is
-     * exceeded. Defaults to {@code 20}. Pass {@code 0} to not follow redirects.
-     */
-    public FetchOptions setMaxRedirects(int maxRedirects) {
-      this.maxRedirects = maxRedirects;
-      return this;
-    }
-    /**
-     * If set changes the request method (e.g. GET or POST).
-     */
-    public FetchOptions setMethod(String method) {
-      this.method = method;
-      return this;
-    }
-    /**
-     * If set changes the post data of request.
-     */
-    public FetchOptions setPostData(String postData) {
-      this.postData = postData;
-      return this;
-    }
-    /**
-     * If set changes the post data of request.
-     */
-    public FetchOptions setPostData(byte[] postData) {
-      this.postData = postData;
-      return this;
-    }
-    /**
-     * Request timeout in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout.
-     */
-    public FetchOptions setTimeout(double timeout) {
-      this.timeout = timeout;
-      return this;
-    }
-    /**
-     * If set changes the request URL. New URL must have same protocol as original one.
-     */
-    public FetchOptions setUrl(String url) {
-      this.url = url;
-      return this;
-    }
-  }
   class FulfillOptions {
     /**
      * Optional response body as text.
@@ -232,15 +97,10 @@ public interface Route {
      */
     public Map<String, String> headers;
     /**
-     * File path to respond with. The content type will be inferred from file extension. If {@code path} is a relative path,
-     * then it is resolved relative to the current working directory.
+     * File path to respond with. The content type will be inferred from file extension. If {@code path} is a relative path, then it
+     * is resolved relative to the current working directory.
      */
     public Path path;
-    /**
-     * {@code APIResponse} to fulfill route's request with. Individual fields of the response (such as headers) can be
-     * overridden using fulfill options.
-     */
-    public APIResponse response;
     /**
      * Response status code, defaults to {@code 200}.
      */
@@ -275,21 +135,13 @@ public interface Route {
       return this;
     }
     /**
-     * File path to respond with. The content type will be inferred from file extension. If {@code path} is a relative path,
-     * then it is resolved relative to the current working directory.
+     * File path to respond with. The content type will be inferred from file extension. If {@code path} is a relative path, then it
+     * is resolved relative to the current working directory.
      */
     public FulfillOptions setPath(Path path) {
       this.path = path;
       return this;
     }
-    /**
-     * {@code APIResponse} to fulfill route's request with. Individual fields of the response (such as headers) can be
-     * overridden using fulfill options.
-     */
-    public FulfillOptions setResponse(APIResponse response) {
-      this.response = response;
-      return this;
-    }
     /**
      * Response status code, defaults to {@code 200}.
      */
@@ -300,8 +152,6 @@ public interface Route {
   }
   /**
    * Aborts the route's request.
-   *
-   * @since v1.8
    */
   default void abort() {
     abort(null);
@@ -313,11 +163,11 @@ public interface Route {
    * <ul>
    * <li> {@code "aborted"} - An operation was aborted (due to user action)</li>
    * <li> {@code "accessdenied"} - Permission to access a resource, other than the network, was denied</li>
-   * <li> {@code "addressunreachable"} - The IP address is unreachable. This usually means that there is no route to the specified
-   * host or network.</li>
+   * <li> {@code "addressunreachable"} - The IP address is unreachable. This usually means that there is no route to the specified host
+   * or network.</li>
    * <li> {@code "blockedbyclient"} - The client chose to block the request.</li>
-   * <li> {@code "blockedbyresponse"} - The request failed because the response was delivered along with requirements which are
-   * not met ('X-Frame-Options' and 'Content-Security-Policy' ancestor checks, for instance).</li>
+   * <li> {@code "blockedbyresponse"} - The request failed because the response was delivered along with requirements which are not met
+   * ('X-Frame-Options' and 'Content-Security-Policy' ancestor checks, for instance).</li>
    * <li> {@code "connectionaborted"} - A connection timed out as a result of not receiving an ACK for data sent.</li>
    * <li> {@code "connectionclosed"} - A connection was closed (corresponding to a TCP FIN).</li>
    * <li> {@code "connectionfailed"} - A connection attempt failed.</li>
@@ -328,246 +178,39 @@ public interface Route {
    * <li> {@code "timedout"} - An operation timed out.</li>
    * <li> {@code "failed"} - A generic failure occurred.</li>
    * </ul>
-   * @since v1.8
    */
   void abort(String errorCode);
   /**
    * Continues route's request with optional overrides.
-   *
-   * <p> **Usage**
    * <pre>{@code
    * page.route("**\/*", route -> {
    *   // Override headers
    *   Map<String, String> headers = new HashMap<>(route.request().headers());
-   *   headers.put("foo", "foo-value"); // set "foo" header
-   *   headers.remove("bar"); // remove "bar" header
+   *   headers.put("foo", "bar"); // set "foo" header
+   *   headers.remove("origin"); // remove "origin" header
    *   route.resume(new Route.ResumeOptions().setHeaders(headers));
    * });
    * }</pre>
-   *
-   * <p> **Details**
-   *
-   * <p> Note that any overrides such as {@code url} or {@code headers} only apply to the request being routed. If this request
-   * results in a redirect, overrides will not be applied to the new redirected request. If you want to propagate a header
-   * through redirects, use the combination of {@link Route#fetch Route.fetch()} and {@link Route#fulfill Route.fulfill()}
-   * instead.
-   *
-   * @since v1.8
    */
   default void resume() {
     resume(null);
   }
   /**
    * Continues route's request with optional overrides.
-   *
-   * <p> **Usage**
    * <pre>{@code
    * page.route("**\/*", route -> {
    *   // Override headers
    *   Map<String, String> headers = new HashMap<>(route.request().headers());
-   *   headers.put("foo", "foo-value"); // set "foo" header
-   *   headers.remove("bar"); // remove "bar" header
+   *   headers.put("foo", "bar"); // set "foo" header
+   *   headers.remove("origin"); // remove "origin" header
    *   route.resume(new Route.ResumeOptions().setHeaders(headers));
    * });
    * }</pre>
-   *
-   * <p> **Details**
-   *
-   * <p> Note that any overrides such as {@code url} or {@code headers} only apply to the request being routed. If this request
-   * results in a redirect, overrides will not be applied to the new redirected request. If you want to propagate a header
-   * through redirects, use the combination of {@link Route#fetch Route.fetch()} and {@link Route#fulfill Route.fulfill()}
-   * instead.
-   *
-   * @since v1.8
    */
   void resume(ResumeOptions options);
-  /**
-   * When several routes match the given pattern, they run in the order opposite to their registration. That way the last
-   * registered route can always override all the previous ones. In the example below, request will be handled by the
-   * bottom-most handler first, then it'll fall back to the previous one and in the end will be aborted by the first
-   * registered route.
-   *
-   * <p> **Usage**
-   * <pre>{@code
-   * page.route("**\/*", route -> {
-   *   // Runs last.
-   *   route.abort();
-   * });
-   *
-   * page.route("**\/*", route -> {
-   *   // Runs second.
-   *   route.fallback();
-   * });
-   *
-   * page.route("**\/*", route -> {
-   *   // Runs first.
-   *   route.fallback();
-   * });
-   * }</pre>
-   *
-   * <p> Registering multiple routes is useful when you want separate handlers to handle different kinds of requests, for example
-   * API calls vs page resources or GET requests vs POST requests as in the example below.
-   * <pre>{@code
-   * // Handle GET requests.
-   * page.route("**\/*", route -> {
-   *   if (!route.request().method().equals("GET")) {
-   *     route.fallback();
-   *     return;
-   *   }
-   *   // Handling GET only.
-   *   // ...
-   * });
-   *
-   * // Handle POST requests.
-   * page.route("**\/*", route -> {
-   *   if (!route.request().method().equals("POST")) {
-   *     route.fallback();
-   *     return;
-   *   }
-   *   // Handling POST only.
-   *   // ...
-   * });
-   * }</pre>
-   *
-   * <p> One can also modify request while falling back to the subsequent handler, that way intermediate route handler can modify
-   * url, method, headers and postData of the request.
-   * <pre>{@code
-   * page.route("**\/*", route -> {
-   *   // Override headers
-   *   Map<String, String> headers = new HashMap<>(route.request().headers());
-   *   headers.put("foo", "foo-value"); // set "foo" header
-   *   headers.remove("bar"); // remove "bar" header
-   *   route.fallback(new Route.ResumeOptions().setHeaders(headers));
-   * });
-   * }</pre>
-   *
-   * @since v1.23
-   */
-  default void fallback() {
-    fallback(null);
-  }
-  /**
-   * When several routes match the given pattern, they run in the order opposite to their registration. That way the last
-   * registered route can always override all the previous ones. In the example below, request will be handled by the
-   * bottom-most handler first, then it'll fall back to the previous one and in the end will be aborted by the first
-   * registered route.
-   *
-   * <p> **Usage**
-   * <pre>{@code
-   * page.route("**\/*", route -> {
-   *   // Runs last.
-   *   route.abort();
-   * });
-   *
-   * page.route("**\/*", route -> {
-   *   // Runs second.
-   *   route.fallback();
-   * });
-   *
-   * page.route("**\/*", route -> {
-   *   // Runs first.
-   *   route.fallback();
-   * });
-   * }</pre>
-   *
-   * <p> Registering multiple routes is useful when you want separate handlers to handle different kinds of requests, for example
-   * API calls vs page resources or GET requests vs POST requests as in the example below.
-   * <pre>{@code
-   * // Handle GET requests.
-   * page.route("**\/*", route -> {
-   *   if (!route.request().method().equals("GET")) {
-   *     route.fallback();
-   *     return;
-   *   }
-   *   // Handling GET only.
-   *   // ...
-   * });
-   *
-   * // Handle POST requests.
-   * page.route("**\/*", route -> {
-   *   if (!route.request().method().equals("POST")) {
-   *     route.fallback();
-   *     return;
-   *   }
-   *   // Handling POST only.
-   *   // ...
-   * });
-   * }</pre>
-   *
-   * <p> One can also modify request while falling back to the subsequent handler, that way intermediate route handler can modify
-   * url, method, headers and postData of the request.
-   * <pre>{@code
-   * page.route("**\/*", route -> {
-   *   // Override headers
-   *   Map<String, String> headers = new HashMap<>(route.request().headers());
-   *   headers.put("foo", "foo-value"); // set "foo" header
-   *   headers.remove("bar"); // remove "bar" header
-   *   route.fallback(new Route.ResumeOptions().setHeaders(headers));
-   * });
-   * }</pre>
-   *
-   * @since v1.23
-   */
-  void fallback(FallbackOptions options);
-  /**
-   * Performs the request and fetches result without fulfilling it, so that the response could be modified and then
-   * fulfilled.
-   *
-   * <p> **Usage**
-   * <pre>{@code
-   * page.route("https://dog.ceo/api/breeds/list/all", route -> {
-   *   APIResponse response = route.fetch();
-   *   JsonObject json = new Gson().fromJson(response.text(), JsonObject.class);
-   *   JsonObject message = itemObj.get("json").getAsJsonObject();
-   *   message.set("big_red_dog", new JsonArray());
-   *   route.fulfill(new Route.FulfillOptions()
-   *     .setResponse(response)
-   *     .setBody(json.toString()));
-   * });
-   * }</pre>
-   *
-   * <p> **Details**
-   *
-   * <p> Note that {@code headers} option will apply to the fetched request as well as any redirects initiated by it. If you want
-   * to only apply {@code headers} to the original request, but not to redirects, look into {@link Route#resume
-   * Route.resume()} instead.
-   *
-   * @since v1.29
-   */
-  default APIResponse fetch() {
-    return fetch(null);
-  }
-  /**
-   * Performs the request and fetches result without fulfilling it, so that the response could be modified and then
-   * fulfilled.
-   *
-   * <p> **Usage**
-   * <pre>{@code
-   * page.route("https://dog.ceo/api/breeds/list/all", route -> {
-   *   APIResponse response = route.fetch();
-   *   JsonObject json = new Gson().fromJson(response.text(), JsonObject.class);
-   *   JsonObject message = itemObj.get("json").getAsJsonObject();
-   *   message.set("big_red_dog", new JsonArray());
-   *   route.fulfill(new Route.FulfillOptions()
-   *     .setResponse(response)
-   *     .setBody(json.toString()));
-   * });
-   * }</pre>
-   *
-   * <p> **Details**
-   *
-   * <p> Note that {@code headers} option will apply to the fetched request as well as any redirects initiated by it. If you want
-   * to only apply {@code headers} to the original request, but not to redirects, look into {@link Route#resume
-   * Route.resume()} instead.
-   *
-   * @since v1.29
-   */
-  APIResponse fetch(FetchOptions options);
   /**
    * Fulfills route's request with given response.
    *
-   * <p> **Usage**
-   *
    * <p> An example of fulfilling all requests with 404 responses:
    * <pre>{@code
    * page.route("**\/*", route -> {
@@ -583,8 +226,6 @@ public interface Route {
    * page.route("**\/xhr_endpoint", route -> route.fulfill(
    *   new Route.FulfillOptions().setPath(Paths.get("mock_data.json"))));
    * }</pre>
-   *
-   * @since v1.8
    */
   default void fulfill() {
     fulfill(null);
@@ -592,8 +233,6 @@ public interface Route {
   /**
    * Fulfills route's request with given response.
    *
-   * <p> **Usage**
-   *
    * <p> An example of fulfilling all requests with 404 responses:
    * <pre>{@code
    * page.route("**\/*", route -> {
@@ -609,14 +248,10 @@ public interface Route {
    * page.route("**\/xhr_endpoint", route -> route.fulfill(
    *   new Route.FulfillOptions().setPath(Paths.get("mock_data.json"))));
    * }</pre>
-   *
-   * @since v1.8
    */
   void fulfill(FulfillOptions options);
   /**
    * A request to be routed.
-   *
-   * @since v1.8
    */
   Request request();
 }

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

@@ -17,24 +17,25 @@
 package com.microsoft.playwright;
 
 import java.nio.file.Path;
+import java.util.*;
 
 /**
  * Selectors can be used to install custom selector engines. See <a
- * href="https://playwright.dev/java/docs/extensibility">extensibility</a> for more information.
+ * href="https://playwright.dev/java/docs/selectors/">Working with selectors</a> for more information.
  */
 public interface Selectors {
   class RegisterOptions {
     /**
      * Whether to run this selector engine in isolated JavaScript environment. This environment has access to the same DOM, but
-     * not any JavaScript objects from the frame's scripts. Defaults to {@code false}. Note that running as a content script is
-     * not guaranteed when this engine is used together with other registered engines.
+     * not any JavaScript objects from the frame's scripts. Defaults to {@code false}. Note that running as a content script is not
+     * guaranteed when this engine is used together with other registered engines.
      */
     public Boolean contentScript;
 
     /**
      * Whether to run this selector engine in isolated JavaScript environment. This environment has access to the same DOM, but
-     * not any JavaScript objects from the frame's scripts. Defaults to {@code false}. Note that running as a content script is
-     * not guaranteed when this engine is used together with other registered engines.
+     * not any JavaScript objects from the frame's scripts. Defaults to {@code false}. Note that running as a content script is not
+     * guaranteed when this engine is used together with other registered engines.
      */
     public RegisterOptions setContentScript(boolean contentScript) {
       this.contentScript = contentScript;
@@ -42,13 +43,9 @@ public interface Selectors {
     }
   }
   /**
-   * Selectors must be registered before creating the page.
-   *
-   * <p> **Usage**
-   *
-   * <p> An example of registering selector engine that queries elements based on a tag name:
+   * An example of registering selector engine that queries elements based on a tag name:
    * <pre>{@code
-   * // Script that evaluates to a selector engine instance. The script is evaluated in the page context.
+   * // Script that evaluates to a selector engine instance.
    * String createTagNameEngine = "{\n" +
    *   "  // Returns the first element matching given selector in the root's subtree.\n" +
    *   "  query(root, selector) {\n" +
@@ -66,29 +63,24 @@ public interface Selectors {
    * page.setContent("<div><button>Click me</button></div>");
    * // Use the selector prefixed with its name.
    * Locator button = page.locator("tag=button");
-   * // Combine it with built-in locators.
-   * page.locator("tag=div").getByText("Click me").click();
+   * // Combine it with other selector engines.
+   * page.click("tag=div >> text=\"Click me\"");
    * // Can use it in any methods supporting selectors.
    * int buttonCount = (int) page.locator("tag=button").count();
    * browser.close();
    * }</pre>
    *
-   * @param name Name that is used in selectors as a prefix, e.g. {@code {name: 'foo'}} enables {@code foo=myselectorbody} selectors. May
-   * only contain {@code [a-zA-Z0-9_]} characters.
-   * @param script Script that evaluates to a selector engine instance. The script is evaluated in the page context.
-   * @since v1.8
+   * @param name Name that is used in selectors as a prefix, e.g. {@code {name: 'foo'}} enables {@code foo=myselectorbody} selectors. May only
+   * contain {@code [a-zA-Z0-9_]} characters.
+   * @param script Script that evaluates to a selector engine instance.
    */
   default void register(String name, String script) {
     register(name, script, null);
   }
   /**
-   * Selectors must be registered before creating the page.
-   *
-   * <p> **Usage**
-   *
-   * <p> An example of registering selector engine that queries elements based on a tag name:
+   * An example of registering selector engine that queries elements based on a tag name:
    * <pre>{@code
-   * // Script that evaluates to a selector engine instance. The script is evaluated in the page context.
+   * // Script that evaluates to a selector engine instance.
    * String createTagNameEngine = "{\n" +
    *   "  // Returns the first element matching given selector in the root's subtree.\n" +
    *   "  query(root, selector) {\n" +
@@ -106,27 +98,22 @@ public interface Selectors {
    * page.setContent("<div><button>Click me</button></div>");
    * // Use the selector prefixed with its name.
    * Locator button = page.locator("tag=button");
-   * // Combine it with built-in locators.
-   * page.locator("tag=div").getByText("Click me").click();
+   * // Combine it with other selector engines.
+   * page.click("tag=div >> text=\"Click me\"");
    * // Can use it in any methods supporting selectors.
    * int buttonCount = (int) page.locator("tag=button").count();
    * browser.close();
    * }</pre>
    *
-   * @param name Name that is used in selectors as a prefix, e.g. {@code {name: 'foo'}} enables {@code foo=myselectorbody} selectors. May
-   * only contain {@code [a-zA-Z0-9_]} characters.
-   * @param script Script that evaluates to a selector engine instance. The script is evaluated in the page context.
-   * @since v1.8
+   * @param name Name that is used in selectors as a prefix, e.g. {@code {name: 'foo'}} enables {@code foo=myselectorbody} selectors. May only
+   * contain {@code [a-zA-Z0-9_]} characters.
+   * @param script Script that evaluates to a selector engine instance.
    */
   void register(String name, String script, RegisterOptions options);
   /**
-   * Selectors must be registered before creating the page.
-   *
-   * <p> **Usage**
-   *
-   * <p> An example of registering selector engine that queries elements based on a tag name:
+   * An example of registering selector engine that queries elements based on a tag name:
    * <pre>{@code
-   * // Script that evaluates to a selector engine instance. The script is evaluated in the page context.
+   * // Script that evaluates to a selector engine instance.
    * String createTagNameEngine = "{\n" +
    *   "  // Returns the first element matching given selector in the root's subtree.\n" +
    *   "  query(root, selector) {\n" +
@@ -144,29 +131,24 @@ public interface Selectors {
    * page.setContent("<div><button>Click me</button></div>");
    * // Use the selector prefixed with its name.
    * Locator button = page.locator("tag=button");
-   * // Combine it with built-in locators.
-   * page.locator("tag=div").getByText("Click me").click();
+   * // Combine it with other selector engines.
+   * page.click("tag=div >> text=\"Click me\"");
    * // Can use it in any methods supporting selectors.
    * int buttonCount = (int) page.locator("tag=button").count();
    * browser.close();
    * }</pre>
    *
-   * @param name Name that is used in selectors as a prefix, e.g. {@code {name: 'foo'}} enables {@code foo=myselectorbody} selectors. May
-   * only contain {@code [a-zA-Z0-9_]} characters.
-   * @param script Script that evaluates to a selector engine instance. The script is evaluated in the page context.
-   * @since v1.8
+   * @param name Name that is used in selectors as a prefix, e.g. {@code {name: 'foo'}} enables {@code foo=myselectorbody} selectors. May only
+   * contain {@code [a-zA-Z0-9_]} characters.
+   * @param script Script that evaluates to a selector engine instance.
    */
   default void register(String name, Path script) {
     register(name, script, null);
   }
   /**
-   * Selectors must be registered before creating the page.
-   *
-   * <p> **Usage**
-   *
-   * <p> An example of registering selector engine that queries elements based on a tag name:
+   * An example of registering selector engine that queries elements based on a tag name:
    * <pre>{@code
-   * // Script that evaluates to a selector engine instance. The script is evaluated in the page context.
+   * // Script that evaluates to a selector engine instance.
    * String createTagNameEngine = "{\n" +
    *   "  // Returns the first element matching given selector in the root's subtree.\n" +
    *   "  query(root, selector) {\n" +
@@ -184,26 +166,17 @@ public interface Selectors {
    * page.setContent("<div><button>Click me</button></div>");
    * // Use the selector prefixed with its name.
    * Locator button = page.locator("tag=button");
-   * // Combine it with built-in locators.
-   * page.locator("tag=div").getByText("Click me").click();
+   * // Combine it with other selector engines.
+   * page.click("tag=div >> text=\"Click me\"");
    * // Can use it in any methods supporting selectors.
    * int buttonCount = (int) page.locator("tag=button").count();
    * browser.close();
    * }</pre>
    *
-   * @param name Name that is used in selectors as a prefix, e.g. {@code {name: 'foo'}} enables {@code foo=myselectorbody} selectors. May
-   * only contain {@code [a-zA-Z0-9_]} characters.
-   * @param script Script that evaluates to a selector engine instance. The script is evaluated in the page context.
-   * @since v1.8
+   * @param name Name that is used in selectors as a prefix, e.g. {@code {name: 'foo'}} enables {@code foo=myselectorbody} selectors. May only
+   * contain {@code [a-zA-Z0-9_]} characters.
+   * @param script Script that evaluates to a selector engine instance.
    */
   void register(String name, Path script, RegisterOptions options);
-  /**
-   * Defines custom attribute name to be used in {@link Page#getByTestId Page.getByTestId()}. {@code data-testid} is used by
-   * default.
-   *
-   * @param attributeName Test id attribute name.
-   * @since v1.27
-   */
-  void setTestIdAttribute(String attributeName);
 }
 

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

@@ -16,6 +16,7 @@
 
 package com.microsoft.playwright;
 
+import java.util.*;
 
 /**
  * The Touchscreen class operates in main-frame CSS pixels relative to the top-left corner of the viewport. Methods on the
@@ -24,10 +25,6 @@ package com.microsoft.playwright;
 public interface Touchscreen {
   /**
    * Dispatches a {@code touchstart} and {@code touchend} event with a single touch at the position ({@code x},{@code y}).
-   *
-   * <p> <strong>NOTE:</strong> {@link Page#tap Page.tap()} the method will throw if {@code hasTouch} option of the browser context is false.
-   *
-   * @since v1.8
    */
   void tap(double x, double y);
 }

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

@@ -17,10 +17,11 @@
 package com.microsoft.playwright;
 
 import java.nio.file.Path;
+import java.util.*;
 
 /**
  * API for collecting and saving Playwright traces. Playwright traces can be opened in <a
- * href="https://playwright.dev/java/docs/trace-viewer">Trace Viewer</a> after Playwright script runs.
+ * href="https://playwright.dev/java/docs/trace-viewer/">Trace Viewer</a> after Playwright script runs.
  *
  * <p> Start recording a trace before performing actions. At the end, stop tracing and save it to a file.
  * <pre>{@code
@@ -38,8 +39,8 @@ import java.nio.file.Path;
 public interface Tracing {
   class StartOptions {
     /**
-     * If specified, the trace is going to be saved into the file with the given name inside the {@code tracesDir} folder
-     * specified in {@link BrowserType#launch BrowserType.launch()}.
+     * If specified, the trace is going to be saved into the file with the given name inside the {@code tracesDir} folder specified
+     * in {@link BrowserType#launch BrowserType.launch()}.
      */
     public String name;
     /**
@@ -47,27 +48,17 @@ public interface Tracing {
      */
     public Boolean screenshots;
     /**
-     * If this option is true tracing will
-     * <ul>
-     * <li> capture DOM snapshot on every action</li>
-     * <li> record network activity</li>
-     * </ul>
+     * Whether to capture DOM snapshot on every action.
      */
     public Boolean snapshots;
-    /**
-     * Whether to include source files for trace actions. List of the directories with source code for the application must be
-     * provided via {@code PLAYWRIGHT_JAVA_SRC} environment variable (the paths should be separated by ';' on Windows and by
-     * ':' on other platforms).
-     */
-    public Boolean sources;
     /**
      * Trace name to be shown in the Trace Viewer.
      */
     public String title;
 
     /**
-     * If specified, the trace is going to be saved into the file with the given name inside the {@code tracesDir} folder
-     * specified in {@link BrowserType#launch BrowserType.launch()}.
+     * If specified, the trace is going to be saved into the file with the given name inside the {@code tracesDir} folder specified
+     * in {@link BrowserType#launch BrowserType.launch()}.
      */
     public StartOptions setName(String name) {
       this.name = name;
@@ -81,25 +72,12 @@ public interface Tracing {
       return this;
     }
     /**
-     * If this option is true tracing will
-     * <ul>
-     * <li> capture DOM snapshot on every action</li>
-     * <li> record network activity</li>
-     * </ul>
+     * Whether to capture DOM snapshot on every action.
      */
     public StartOptions setSnapshots(boolean snapshots) {
       this.snapshots = snapshots;
       return this;
     }
-    /**
-     * Whether to include source files for trace actions. List of the directories with source code for the application must be
-     * provided via {@code PLAYWRIGHT_JAVA_SRC} environment variable (the paths should be separated by ';' on Windows and by
-     * ':' on other platforms).
-     */
-    public StartOptions setSources(boolean sources) {
-      this.sources = sources;
-      return this;
-    }
     /**
      * Trace name to be shown in the Trace Viewer.
      */
@@ -109,24 +87,11 @@ public interface Tracing {
     }
   }
   class StartChunkOptions {
-    /**
-     * If specified, the trace is going to be saved into the file with the given name inside the {@code tracesDir} folder
-     * specified in {@link BrowserType#launch BrowserType.launch()}.
-     */
-    public String name;
     /**
      * Trace name to be shown in the Trace Viewer.
      */
     public String title;
 
-    /**
-     * If specified, the trace is going to be saved into the file with the given name inside the {@code tracesDir} folder
-     * specified in {@link BrowserType#launch BrowserType.launch()}.
-     */
-    public StartChunkOptions setName(String name) {
-      this.name = name;
-      return this;
-    }
     /**
      * Trace name to be shown in the Trace Viewer.
      */
@@ -167,8 +132,6 @@ public interface Tracing {
   }
   /**
    * Start tracing.
-   *
-   * <p> **Usage**
    * <pre>{@code
    * context.tracing().start(new Tracing.StartOptions()
    *   .setScreenshots(true)
@@ -178,16 +141,12 @@ public interface Tracing {
    * context.tracing().stop(new Tracing.StopOptions()
    *   .setPath(Paths.get("trace.zip")));
    * }</pre>
-   *
-   * @since v1.12
    */
   default void start() {
     start(null);
   }
   /**
    * Start tracing.
-   *
-   * <p> **Usage**
    * <pre>{@code
    * context.tracing().start(new Tracing.StartOptions()
    *   .setScreenshots(true)
@@ -197,16 +156,12 @@ public interface Tracing {
    * context.tracing().stop(new Tracing.StopOptions()
    *   .setPath(Paths.get("trace.zip")));
    * }</pre>
-   *
-   * @since v1.12
    */
   void start(StartOptions options);
   /**
-   * Start a new trace chunk. If you'd like to record multiple traces on the same {@code BrowserContext}, use {@link
-   * Tracing#start Tracing.start()} once, and then create multiple trace chunks with {@link Tracing#startChunk
-   * Tracing.startChunk()} and {@link Tracing#stopChunk Tracing.stopChunk()}.
-   *
-   * <p> **Usage**
+   * Start a new trace chunk. If you'd like to record multiple traces on the same {@code BrowserContext}, use {@link Tracing#start
+   * Tracing.start()} once, and then create multiple trace chunks with {@link Tracing#startChunk Tracing.startChunk()} and
+   * {@link Tracing#stopChunk Tracing.stopChunk()}.
    * <pre>{@code
    * context.tracing().start(new Tracing.StartOptions()
    *   .setScreenshots(true)
@@ -215,7 +170,7 @@ public interface Tracing {
    * page.navigate("https://playwright.dev");
    *
    * context.tracing().startChunk();
-   * page.getByText("Get Started").click();
+   * page.click("text=Get Started");
    * // Everything between startChunk and stopChunk will be recorded in the trace.
    * context.tracing().stopChunk(new Tracing.StopChunkOptions()
    *   .setPath(Paths.get("trace1.zip")));
@@ -226,18 +181,14 @@ public interface Tracing {
    * context.tracing().stopChunk(new Tracing.StopChunkOptions()
    *   .setPath(Paths.get("trace2.zip")));
    * }</pre>
-   *
-   * @since v1.15
    */
   default void startChunk() {
     startChunk(null);
   }
   /**
-   * Start a new trace chunk. If you'd like to record multiple traces on the same {@code BrowserContext}, use {@link
-   * Tracing#start Tracing.start()} once, and then create multiple trace chunks with {@link Tracing#startChunk
-   * Tracing.startChunk()} and {@link Tracing#stopChunk Tracing.stopChunk()}.
-   *
-   * <p> **Usage**
+   * Start a new trace chunk. If you'd like to record multiple traces on the same {@code BrowserContext}, use {@link Tracing#start
+   * Tracing.start()} once, and then create multiple trace chunks with {@link Tracing#startChunk Tracing.startChunk()} and
+   * {@link Tracing#stopChunk Tracing.stopChunk()}.
    * <pre>{@code
    * context.tracing().start(new Tracing.StartOptions()
    *   .setScreenshots(true)
@@ -246,7 +197,7 @@ public interface Tracing {
    * page.navigate("https://playwright.dev");
    *
    * context.tracing().startChunk();
-   * page.getByText("Get Started").click();
+   * page.click("text=Get Started");
    * // Everything between startChunk and stopChunk will be recorded in the trace.
    * context.tracing().stopChunk(new Tracing.StopChunkOptions()
    *   .setPath(Paths.get("trace1.zip")));
@@ -257,36 +208,26 @@ public interface Tracing {
    * context.tracing().stopChunk(new Tracing.StopChunkOptions()
    *   .setPath(Paths.get("trace2.zip")));
    * }</pre>
-   *
-   * @since v1.15
    */
   void startChunk(StartChunkOptions options);
   /**
    * Stop tracing.
-   *
-   * @since v1.12
    */
   default void stop() {
     stop(null);
   }
   /**
    * Stop tracing.
-   *
-   * @since v1.12
    */
   void stop(StopOptions options);
   /**
    * Stop the trace chunk. See {@link Tracing#startChunk Tracing.startChunk()} for more details about multiple trace chunks.
-   *
-   * @since v1.15
    */
   default void stopChunk() {
     stopChunk(null);
   }
   /**
    * Stop the trace chunk. See {@link Tracing#startChunk Tracing.startChunk()} for more details about multiple trace chunks.
-   *
-   * @since v1.15
    */
   void stopChunk(StopChunkOptions options);
 }

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

@@ -17,6 +17,7 @@
 package com.microsoft.playwright;
 
 import java.nio.file.Path;
+import java.util.*;
 
 /**
  * When browser context is created with the {@code recordVideo} option, each page has a video object associated with it.
@@ -27,15 +28,11 @@ import java.nio.file.Path;
 public interface Video {
   /**
    * Deletes the video file. Will wait for the video to finish if necessary.
-   *
-   * @since v1.11
    */
   void delete();
   /**
    * Returns the file system path this video will be recorded to. The video is guaranteed to be written to the filesystem
    * upon closing the browser context. This method throws when connected remotely.
-   *
-   * @since v1.8
    */
   Path path();
   /**
@@ -43,7 +40,6 @@ public interface Video {
    * the page has closed. This method waits until the page is closed and the video is fully saved.
    *
    * @param path Path where the video should be saved.
-   * @since v1.11
    */
   void saveAs(Path path);
 }

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

@@ -16,6 +16,7 @@
 
 package com.microsoft.playwright;
 
+import java.util.*;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 
@@ -66,8 +67,8 @@ public interface WebSocket {
      */
     public Predicate<WebSocketFrame> predicate;
     /**
-     * Maximum time to wait for in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The
-     * default value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()}.
+     * Maximum time to wait for in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()}.
      */
     public Double timeout;
 
@@ -79,8 +80,8 @@ public interface WebSocket {
       return this;
     }
     /**
-     * Maximum time to wait for in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The
-     * default value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()}.
+     * Maximum time to wait for in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()}.
      */
     public WaitForFrameReceivedOptions setTimeout(double timeout) {
       this.timeout = timeout;
@@ -93,8 +94,8 @@ public interface WebSocket {
      */
     public Predicate<WebSocketFrame> predicate;
     /**
-     * Maximum time to wait for in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The
-     * default value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()}.
+     * Maximum time to wait for in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()}.
      */
     public Double timeout;
 
@@ -106,8 +107,8 @@ public interface WebSocket {
       return this;
     }
     /**
-     * Maximum time to wait for in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The
-     * default value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()}.
+     * Maximum time to wait for in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()}.
      */
     public WaitForFrameSentOptions setTimeout(double timeout) {
       this.timeout = timeout;
@@ -116,54 +117,46 @@ public interface WebSocket {
   }
   /**
    * Indicates that the web socket has been closed.
-   *
-   * @since v1.8
    */
   boolean isClosed();
   /**
    * Contains the URL of the WebSocket.
-   *
-   * @since v1.8
    */
   String url();
   /**
-   * Performs action and waits for a frame to be sent. If predicate is provided, it passes {@code WebSocketFrame} value into
-   * the {@code predicate} function and waits for {@code predicate(webSocketFrame)} to return a truthy value. Will throw an
-   * error if the WebSocket or Page is closed before the frame is received.
+   * Performs action and waits for a frame to be sent. If predicate is provided, it passes {@code WebSocketFrame} value into the
+   * {@code predicate} function and waits for {@code predicate(webSocketFrame)} to return a truthy value. Will throw an error if the
+   * WebSocket or Page is closed before the frame is received.
    *
    * @param callback Callback that performs the action triggering the event.
-   * @since v1.10
    */
   default WebSocketFrame waitForFrameReceived(Runnable callback) {
     return waitForFrameReceived(null, callback);
   }
   /**
-   * Performs action and waits for a frame to be sent. If predicate is provided, it passes {@code WebSocketFrame} value into
-   * the {@code predicate} function and waits for {@code predicate(webSocketFrame)} to return a truthy value. Will throw an
-   * error if the WebSocket or Page is closed before the frame is received.
+   * Performs action and waits for a frame to be sent. If predicate is provided, it passes {@code WebSocketFrame} value into the
+   * {@code predicate} function and waits for {@code predicate(webSocketFrame)} to return a truthy value. Will throw an error if the
+   * WebSocket or Page is closed before the frame is received.
    *
    * @param callback Callback that performs the action triggering the event.
-   * @since v1.10
    */
   WebSocketFrame waitForFrameReceived(WaitForFrameReceivedOptions options, Runnable callback);
   /**
-   * Performs action and waits for a frame to be sent. If predicate is provided, it passes {@code WebSocketFrame} value into
-   * the {@code predicate} function and waits for {@code predicate(webSocketFrame)} to return a truthy value. Will throw an
-   * error if the WebSocket or Page is closed before the frame is sent.
+   * Performs action and waits for a frame to be sent. If predicate is provided, it passes {@code WebSocketFrame} value into the
+   * {@code predicate} function and waits for {@code predicate(webSocketFrame)} to return a truthy value. Will throw an error if the
+   * WebSocket or Page is closed before the frame is sent.
    *
    * @param callback Callback that performs the action triggering the event.
-   * @since v1.10
    */
   default WebSocketFrame waitForFrameSent(Runnable callback) {
     return waitForFrameSent(null, callback);
   }
   /**
-   * Performs action and waits for a frame to be sent. If predicate is provided, it passes {@code WebSocketFrame} value into
-   * the {@code predicate} function and waits for {@code predicate(webSocketFrame)} to return a truthy value. Will throw an
-   * error if the WebSocket or Page is closed before the frame is sent.
+   * Performs action and waits for a frame to be sent. If predicate is provided, it passes {@code WebSocketFrame} value into the
+   * {@code predicate} function and waits for {@code predicate(webSocketFrame)} to return a truthy value. Will throw an error if the
+   * WebSocket or Page is closed before the frame is sent.
    *
    * @param callback Callback that performs the action triggering the event.
-   * @since v1.10
    */
   WebSocketFrame waitForFrameSent(WaitForFrameSentOptions options, Runnable callback);
 }

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

@@ -16,23 +16,20 @@
 
 package com.microsoft.playwright;
 
+import java.util.*;
 
 /**
- * The {@code WebSocketFrame} class represents frames sent over {@code WebSocket} connections in the page. Frame payload is
- * returned by either {@link WebSocketFrame#text WebSocketFrame.text()} or {@link WebSocketFrame#binary
- * WebSocketFrame.binary()} method depending on the its type.
+ * The {@code WebSocketFrame} class represents frames sent over {@code WebSocket} connections in the page. Frame payload is returned by
+ * either {@link WebSocketFrame#text WebSocketFrame.text()} or {@link WebSocketFrame#binary WebSocketFrame.binary()} method
+ * depending on the its type.
  */
 public interface WebSocketFrame {
   /**
    * Returns binary payload.
-   *
-   * @since v1.9
    */
   byte[] binary();
   /**
    * Returns text payload.
-   *
-   * @since v1.9
    */
   String text();
 }

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

@@ -16,12 +16,13 @@
 
 package com.microsoft.playwright;
 
+import java.util.*;
 import java.util.function.Consumer;
 
 /**
  * The Worker class represents a <a href="https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API">WebWorker</a>.
- * {@code worker} event is emitted on the page object to signal a worker creation. {@code close} event is emitted on the
- * worker object when the worker is gone.
+ * {@code worker} event is emitted on the page object to signal a worker creation. {@code close} event is emitted on the worker object
+ * when the worker is gone.
  * <pre>{@code
  * page.onWorker(worker -> {
  *   System.out.println("Worker created: " + worker.url());
@@ -46,14 +47,14 @@ public interface Worker {
 
   class WaitForCloseOptions {
     /**
-     * Maximum time to wait for in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The
-     * default value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()}.
+     * Maximum time to wait for in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()}.
      */
     public Double timeout;
 
     /**
-     * Maximum time to wait for in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The
-     * default value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()}.
+     * Maximum time to wait for in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()}.
      */
     public WaitForCloseOptions setTimeout(double timeout) {
       this.timeout = timeout;
@@ -68,12 +69,11 @@ public interface Worker {
    * Worker#evaluate Worker.evaluate()} would wait for the promise to resolve and return its value.
    *
    * <p> If the function passed to the {@link Worker#evaluate Worker.evaluate()} returns a non-[Serializable] value, then {@link
-   * Worker#evaluate Worker.evaluate()} returns {@code undefined}. Playwright also supports transferring some additional
-   * values that are not serializable by {@code JSON}: {@code -0}, {@code NaN}, {@code Infinity}, {@code -Infinity}.
+   * Worker#evaluate Worker.evaluate()} returns {@code undefined}. Playwright also supports transferring some additional values
+   * that are not serializable by {@code JSON}: {@code -0}, {@code NaN}, {@code Infinity}, {@code -Infinity}.
    *
-   * @param expression JavaScript expression to be evaluated in the browser context. If the expression evaluates to a function, the function is
-   * automatically invoked.
-   * @since v1.8
+   * @param expression JavaScript expression to be evaluated in the browser context. If it looks like a function declaration, it is interpreted
+   * as a function. Otherwise, evaluated as an expression.
    */
   default Object evaluate(String expression) {
     return evaluate(expression, null);
@@ -86,13 +86,12 @@ public interface Worker {
    * Worker#evaluate Worker.evaluate()} would wait for the promise to resolve and return its value.
    *
    * <p> If the function passed to the {@link Worker#evaluate Worker.evaluate()} returns a non-[Serializable] value, then {@link
-   * Worker#evaluate Worker.evaluate()} returns {@code undefined}. Playwright also supports transferring some additional
-   * values that are not serializable by {@code JSON}: {@code -0}, {@code NaN}, {@code Infinity}, {@code -Infinity}.
+   * Worker#evaluate Worker.evaluate()} returns {@code undefined}. Playwright also supports transferring some additional values
+   * that are not serializable by {@code JSON}: {@code -0}, {@code NaN}, {@code Infinity}, {@code -Infinity}.
    *
-   * @param expression JavaScript expression to be evaluated in the browser context. If the expression evaluates to a function, the function is
-   * automatically invoked.
+   * @param expression JavaScript expression to be evaluated in the browser context. If it looks like a function declaration, it is interpreted
+   * as a function. Otherwise, evaluated as an expression.
    * @param arg Optional argument to pass to {@code expression}.
-   * @since v1.8
    */
   Object evaluate(String expression, Object arg);
   /**
@@ -105,9 +104,8 @@ public interface Worker {
    * href='https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise'>Promise</a>, then {@link
    * Worker#evaluateHandle Worker.evaluateHandle()} would wait for the promise to resolve and return its value.
    *
-   * @param expression JavaScript expression to be evaluated in the browser context. If the expression evaluates to a function, the function is
-   * automatically invoked.
-   * @since v1.8
+   * @param expression JavaScript expression to be evaluated in the browser context. If it looks like a function declaration, it is interpreted
+   * as a function. Otherwise, evaluated as an expression.
    */
   default JSHandle evaluateHandle(String expression) {
     return evaluateHandle(expression, null);
@@ -122,23 +120,16 @@ public interface Worker {
    * href='https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise'>Promise</a>, then {@link
    * Worker#evaluateHandle Worker.evaluateHandle()} would wait for the promise to resolve and return its value.
    *
-   * @param expression JavaScript expression to be evaluated in the browser context. If the expression evaluates to a function, the function is
-   * automatically invoked.
+   * @param expression JavaScript expression to be evaluated in the browser context. If it looks like a function declaration, it is interpreted
+   * as a function. Otherwise, evaluated as an expression.
    * @param arg Optional argument to pass to {@code expression}.
-   * @since v1.8
    */
   JSHandle evaluateHandle(String expression, Object arg);
-  /**
-   *
-   *
-   * @since v1.8
-   */
   String url();
   /**
    * Performs action and waits for the Worker to close.
    *
    * @param callback Callback that performs the action triggering the event.
-   * @since v1.10
    */
   default Worker waitForClose(Runnable callback) {
     return waitForClose(null, callback);
@@ -147,7 +138,6 @@ public interface Worker {
    * Performs action and waits for the Worker to close.
    *
    * @param callback Callback that performs the action triggering the event.
-   * @since v1.10
    */
   Worker waitForClose(WaitForCloseOptions options, Runnable callback);
 }

playwright/src/main/java/com/microsoft/playwright/assertions/APIResponseAssertions.java

@@ -1,61 +0,0 @@
-/*
- * Copyright (c) Microsoft Corporation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.microsoft.playwright.assertions;
-
-
-/**
- * The {@code APIResponseAssertions} class provides assertion methods that can be used to make assertions about the {@code
- * APIResponse} in the tests.
- * <pre>{@code
- * ...
- * import static com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat;
- *
- * public class TestPage {
- *   ...
- *   @Test
- *   void navigatesToLoginPage() {
- *     ...
- *     APIResponse response = page.request().get('https://playwright.dev');
- *     assertThat(response).isOK();
- *   }
- * }
- * }</pre>
- */
-public interface APIResponseAssertions {
-  /**
-   * Makes the assertion check for the opposite condition. For example, this code tests that the response status is not
-   * successful:
-   * <pre>{@code
-   * assertThat(response).not().isOK();
-   * }</pre>
-   *
-   * @since v1.20
-   */
-  APIResponseAssertions not();
-  /**
-   * Ensures the response status code is within {@code 200..299} range.
-   *
-   * <p> **Usage**
-   * <pre>{@code
-   * assertThat(response).isOK();
-   * }</pre>
-   *
-   * @since v1.18
-   */
-  void isOK();
-}
-

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

@@ -1,205 +0,0 @@
-package com.microsoft.playwright.impl;
-
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.microsoft.playwright.APIRequestContext;
-import com.microsoft.playwright.APIResponse;
-import com.microsoft.playwright.PlaywrightException;
-import com.microsoft.playwright.Request;
-import com.microsoft.playwright.options.FilePayload;
-import com.microsoft.playwright.options.RequestOptions;
-
-import java.io.File;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Path;
-import java.util.Base64;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import static com.microsoft.playwright.impl.Serialization.*;
-import static com.microsoft.playwright.impl.Utils.toFilePayload;
-
-class APIRequestContextImpl extends ChannelOwner implements APIRequestContext {
-  private final TracingImpl tracing;
-
-  APIRequestContextImpl(ChannelOwner parent, String type, String guid, JsonObject initializer) {
-    super(parent, type, guid, initializer);
-    this.tracing = connection.getExistingObject(initializer.getAsJsonObject("tracing").get("guid").getAsString());
-  }
-
-  @Override
-  public APIResponse delete(String url, RequestOptions options) {
-    return fetch(url, ensureOptions(options, "DELETE"));
-  }
-
-  @Override
-  public void dispose() {
-    withLogging("APIRequestContext.dispose", () -> sendMessage("dispose"));
-  }
-
-  @Override
-  public APIResponse fetch(String urlOrRequest, RequestOptions options) {
-    return withLogging("APIRequestContext.fetch", () -> fetchImpl(urlOrRequest, (RequestOptionsImpl) options));
-  }
-
-  @Override
-  public APIResponse fetch(Request request, RequestOptions optionsArg) {
-    RequestOptionsImpl options = (RequestOptionsImpl) optionsArg;
-    if (options == null) {
-      options = new RequestOptionsImpl();
-    }
-    if (options.method == null) {
-      options.method = request.method();
-    }
-    if (options.headers == null) {
-      options.headers = request.headers();
-    }
-    if (options.data == null && options.form == null && options.multipart == null) {
-      options.data = request.postDataBuffer();
-    }
-    return fetch(request.url(), options);
-  }
-
-  private APIResponse fetchImpl(String url, RequestOptionsImpl options) {
-    if (options == null) {
-      options = new RequestOptionsImpl();
-    }
-    JsonObject params = new JsonObject();
-    params.addProperty("url", url);
-    if (options.params != null) {
-      Map<String, String> queryParams = new LinkedHashMap<>();
-      for (Map.Entry<String, ?> e : options.params.entrySet()) {
-        queryParams.put(e.getKey(), "" + e.getValue());
-      }
-      params.add("params", toNameValueArray(queryParams));
-    }
-    if (options.method != null) {
-      params.addProperty("method", options.method);
-    }
-    if (options.headers != null) {
-      params.add("headers", toProtocol(options.headers));
-    }
-
-    if (options.data != null) {
-      byte[] bytes = null;
-      if (options.data instanceof byte[]) {
-        bytes = (byte[]) options.data;
-      } else if (options.data instanceof String && !isJsonContentType(options.headers)) {
-        bytes = ((String) options.data).getBytes(StandardCharsets.UTF_8);
-      }
-      if (bytes == null) {
-        params.add("jsonData", gson().toJsonTree(options.data));
-      } else {
-        String base64 = Base64.getEncoder().encodeToString(bytes);
-        params.addProperty("postData", base64);
-      }
-    }
-    if (options.form != null) {
-      params.add("formData", toNameValueArray(options.form.fields));
-    }
-    if (options.multipart != null) {
-      params.add("multipartData", serializeMultipartData(options.multipart.fields));
-    }
-    if (options.timeout != null) {
-      params.addProperty("timeout", options.timeout);
-    }
-    if (options.failOnStatusCode != null) {
-      params.addProperty("failOnStatusCode", options.failOnStatusCode);
-    }
-    if (options.ignoreHTTPSErrors != null) {
-      params.addProperty("ignoreHTTPSErrors", options.ignoreHTTPSErrors);
-    }
-    if (options.maxRedirects != null) {
-      if (options.maxRedirects < 0) {
-        throw new PlaywrightException("'maxRedirects' should be greater than or equal to '0'");
-      }
-      params.addProperty("maxRedirects", options.maxRedirects);
-    }
-    JsonObject json = sendMessage("fetch", params).getAsJsonObject();
-    return new APIResponseImpl(this, json.getAsJsonObject("response"));
-  }
-
-  private static boolean isJsonContentType(Map<String, String> headers) {
-    if (headers == null) {
-      return false;
-    }
-    for (Map.Entry<String, String> e : headers.entrySet()) {
-      if ("content-type".equalsIgnoreCase(e.getKey())) {
-        return "application/json".equals(e.getValue());
-      }
-    }
-    return false;
-  }
-
-  private static JsonArray serializeMultipartData(Map<String, Object> data) {
-    JsonArray result = new JsonArray();
-    for (Map.Entry<String, Object> e : data.entrySet()) {
-      FilePayload filePayload = null;
-      if (e.getValue() instanceof FilePayload) {
-        filePayload = (FilePayload) e.getValue();
-      } else if (e.getValue() instanceof Path) {
-        filePayload = toFilePayload((Path) e.getValue());
-      } else if (e.getValue() instanceof File) {
-        filePayload = toFilePayload(((File) e.getValue()).toPath());
-      }
-      JsonObject item = new JsonObject();
-      item.addProperty("name", e.getKey());
-      if (filePayload == null) {
-        item.addProperty("value", "" + e.getValue());
-      } else {
-        item.add("file", toProtocol(filePayload));
-      }
-      result.add(item);
-    }
-    return result;
-  }
-
-  @Override
-  public APIResponse get(String url, RequestOptions options) {
-    return fetch(url, ensureOptions(options, "GET"));
-  }
-
-  @Override
-  public APIResponse head(String url, RequestOptions options) {
-    return fetch(url, ensureOptions(options, "HEAD"));
-  }
-
-  @Override
-  public APIResponse patch(String url, RequestOptions options) {
-    return fetch(url, ensureOptions(options, "PATCH"));
-  }
-
-  @Override
-  public APIResponse post(String url, RequestOptions options) {
-    return fetch(url, ensureOptions(options, "POST"));
-  }
-
-  @Override
-  public APIResponse put(String url, RequestOptions options) {
-    return fetch(url, ensureOptions(options, "PUT"));
-  }
-
-  @Override
-  public String storageState(StorageStateOptions options) {
-    return withLogging("APIRequestContext.storageState", () -> {
-      JsonElement json = sendMessage("storageState");
-      String storageState = json.toString();
-      if (options != null && options.path != null) {
-        Utils.writeToFile(storageState.getBytes(StandardCharsets.UTF_8), options.path);
-      }
-      return storageState;
-    });
-  }
-
-  private static RequestOptionsImpl ensureOptions(RequestOptions options, String method) {
-    RequestOptionsImpl impl = Utils.clone((RequestOptionsImpl) options);
-    if (impl == null) {
-      impl = new RequestOptionsImpl();
-    }
-    if (impl.method == null) {
-      impl.method = method;
-    }
-    return impl;
-  }
-}

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

@@ -1,53 +0,0 @@
-package com.microsoft.playwright.impl;
-
-import com.google.gson.Gson;
-import com.google.gson.JsonObject;
-import com.microsoft.playwright.APIRequest;
-import com.microsoft.playwright.PlaywrightException;
-
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-
-import static com.microsoft.playwright.impl.Serialization.gson;
-
-class APIRequestImpl implements APIRequest {
-  private final PlaywrightImpl playwright;
-
-  APIRequestImpl(PlaywrightImpl playwright) {
-    this.playwright = playwright;
-  }
-
-  @Override
-  public APIRequestContextImpl newContext(NewContextOptions options) {
-    return playwright.withLogging("APIRequest.newContext", () -> newContextImpl(options));
-  }
-
-  private APIRequestContextImpl newContextImpl(NewContextOptions options) {
-    if (options == null) {
-      options = new NewContextOptions();
-    }
-    if (options.storageStatePath != null) {
-      try {
-        byte[] bytes = Files.readAllBytes(options.storageStatePath);
-        options.storageState = new String(bytes, StandardCharsets.UTF_8);
-        options.storageStatePath = null;
-      } catch (IOException e) {
-        throw new PlaywrightException("Failed to read storage state from file", e);
-      }
-    }
-    JsonObject storageState = null;
-    if (options.storageState != null) {
-      storageState = new Gson().fromJson(options.storageState, JsonObject.class);
-      options.storageState = null;
-    }
-    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
-    if (storageState != null) {
-      params.add("storageState", storageState);
-    }
-
-    JsonObject result = playwright.sendMessage("newRequest", params).getAsJsonObject();
-    APIRequestContextImpl context = playwright.connection.getExistingObject(result.getAsJsonObject("request").get("guid").getAsString());
-    return context;
-  }
-}

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

@@ -1,74 +0,0 @@
-/*
- * Copyright (c) Microsoft Corporation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.microsoft.playwright.impl;
-
-import com.microsoft.playwright.APIResponse;
-import com.microsoft.playwright.assertions.APIResponseAssertions;
-import org.opentest4j.AssertionFailedError;
-
-import java.util.List;
-import java.util.regex.Pattern;
-
-public class APIResponseAssertionsImpl implements APIResponseAssertions {
-  private final APIResponse actual;
-  private final boolean isNot;
-
-  APIResponseAssertionsImpl(APIResponse response, boolean isNot) {
-    this.actual = response;
-    this.isNot = isNot;
-  }
-
-  public APIResponseAssertionsImpl(APIResponse response) {
-    this(response, false);
-  }
-
-  @Override
-  public APIResponseAssertions not() {
-    return new APIResponseAssertionsImpl(actual, !isNot);
-  }
-
-  @Override
-  public void isOK() {
-    if (actual.ok() == !isNot) {
-      return;
-    }
-    String message = "Response status expected to be within [200..299] range, was " + actual.status();
-    if (isNot) {
-      message = message.replace("expected to", "expected not to");
-    }
-    List<String> logList = ((APIResponseImpl) actual).fetchLog();
-    String log = String.join("\n", logList);
-    if (!log.isEmpty()) {
-      log = "\nCall log:\n" + log;
-    }
-
-    String contentType = actual.headers().get("content-type");
-    boolean isTextEncoding = contentType == null ? false : isTextualMimeType(contentType);
-    String responseText = "";
-    if (isTextEncoding) {
-      String text = actual.text();
-      if (text != null) {
-        responseText = "\nResponse text:\n" + (text.length() > 1000 ? text.substring(0, 1000) : text);
-      }
-    }
-
-    throw new AssertionFailedError(message + log + responseText);
-  }
-  static boolean isTextualMimeType(String mimeType) {
-    return Pattern.matches("^(text/.*?|application/(json|(x-)?javascript|xml.*?|ecmascript|graphql|x-www-form-urlencoded)|image/svg(\\+xml)?|application/.*?(\\+json|\\+xml))(;\\s*charset=.*)?$", mimeType);
-  }
-}

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

@@ -1,124 +0,0 @@
-/*
- * Copyright (c) Microsoft Corporation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.microsoft.playwright.impl;
-
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.reflect.TypeToken;
-import com.microsoft.playwright.APIResponse;
-import com.microsoft.playwright.PlaywrightException;
-import com.microsoft.playwright.options.HttpHeader;
-
-import java.nio.charset.StandardCharsets;
-import java.util.Base64;
-import java.util.List;
-import java.util.Map;
-
-import static com.microsoft.playwright.impl.Serialization.gson;
-import static com.microsoft.playwright.impl.Utils.isSafeCloseError;
-import static java.util.Arrays.asList;
-
-class APIResponseImpl implements APIResponse {
-  final APIRequestContextImpl context;
-  private final JsonObject initializer;
-  private final RawHeaders headers;
-
-  APIResponseImpl(APIRequestContextImpl apiRequestContext, JsonObject response) {
-    context = apiRequestContext;
-    initializer = response;
-    headers = new RawHeaders(asList(gson().fromJson(initializer.getAsJsonArray("headers"), HttpHeader[].class)));
-  }
-
-  @Override
-  public byte[] body() {
-    return context.withLogging("APIResponse.body", () -> {
-      try {
-        JsonObject params = new JsonObject();
-        params.addProperty("fetchUid", fetchUid());
-        JsonObject json = context.sendMessage("fetchResponseBody", params).getAsJsonObject();
-        if (!json.has("binary")) {
-          throw new PlaywrightException("Response has been disposed");
-        }
-        return Base64.getDecoder().decode(json.get("binary").getAsString());
-      } catch (PlaywrightException e) {
-        if (isSafeCloseError(e)) {
-          throw new PlaywrightException("Response has been disposed");
-        }
-        throw e;
-      }
-    });
-  }
-
-  @Override
-  public void dispose() {
-    context.withLogging("APIResponse.dispose", () -> {
-      JsonObject params = new JsonObject();
-      params.addProperty("fetchUid", fetchUid());
-      context.sendMessage("disposeAPIResponse", params);
-    });
-  }
-
-  @Override
-  public Map<String, String> headers() {
-    return headers.headers();
-  }
-
-  @Override
-  public List<HttpHeader> headersArray() {
-    return headers.headersArray();
-  }
-
-  @Override
-  public boolean ok() {
-    int status = status();
-    return status == 0 || (status >= 200 && status <= 299);
-  }
-
-  @Override
-  public int status() {
-    return initializer.get("status").getAsInt();
-  }
-
-  @Override
-  public String statusText() {
-    return initializer.get("statusText").getAsString();
-  }
-
-  @Override
-  public String text() {
-    return new String(body(), StandardCharsets.UTF_8);
-  }
-
-  @Override
-  public String url() {
-    return initializer.get("url").getAsString();
-  }
-
-  String fetchUid() {
-    return initializer.get("fetchUid").getAsString();
-  }
-
-  List<String> fetchLog() {
-    JsonObject params = new JsonObject();
-    params.addProperty("fetchUid", fetchUid());
-    JsonObject json = context.sendMessage("fetchLog", params).getAsJsonObject();
-    JsonArray log = json.get("log").getAsJsonArray();
-    return gson().fromJson(log, new TypeToken<List<String>>() {}.getType());
-  }
-
-}

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

@@ -26,6 +26,7 @@ import java.nio.file.Path;
 import static com.microsoft.playwright.impl.Utils.writeToFile;
 
 class ArtifactImpl extends ChannelOwner {
+  boolean isRemote;
   public ArtifactImpl(ChannelOwner parent, String type, String guid, JsonObject initializer) {
     super(parent, type, guid, initializer);
   }
@@ -56,7 +57,7 @@ class ArtifactImpl extends ChannelOwner {
   }
 
   public Path pathAfterFinished() {
-    if (connection.isRemote) {
+    if (isRemote) {
       throw new PlaywrightException("Path is not available when using browserType.connect(). Use download.saveAs() to save a local copy.");
     }
     JsonObject json = sendMessage("pathAfterFinished").getAsJsonObject();
@@ -64,7 +65,7 @@ class ArtifactImpl extends ChannelOwner {
   }
 
   public void saveAs(Path path) {
-    if (connection.isRemote) {
+    if (isRemote) {
       JsonObject jsonObject = sendMessage("saveAsStream").getAsJsonObject();
       Stream stream = connection.getExistingObject(jsonObject.getAsJsonObject("stream").get("guid").getAsString());
       writeToFile(stream.stream(), path);

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

@@ -20,21 +20,24 @@ import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.microsoft.playwright.*;
-import com.microsoft.playwright.options.*;
+import com.microsoft.playwright.options.BindingCallback;
+import com.microsoft.playwright.options.Cookie;
+import com.microsoft.playwright.options.FunctionCallback;
+import com.microsoft.playwright.options.Geolocation;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.*;
-import java.util.function.BooleanSupplier;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
-import static com.microsoft.playwright.impl.Serialization.addHarUrlFilter;
 import static com.microsoft.playwright.impl.Serialization.gson;
 import static com.microsoft.playwright.impl.Utils.isSafeCloseError;
 import static java.nio.charset.StandardCharsets.UTF_8;
@@ -44,43 +47,19 @@ import static java.util.Arrays.asList;
 class BrowserContextImpl extends ChannelOwner implements BrowserContext {
   private final BrowserImpl browser;
   private final TracingImpl tracing;
-  private final APIRequestContextImpl request;
   final List<PageImpl> pages = new ArrayList<>();
   final Router routes = new Router();
-  private boolean closeWasCalled;
-  private final WaitableEvent<EventType, ?> closePromise;
+  private boolean isClosedOrClosing;
   final Map<String, BindingCallback> bindings = new HashMap<>();
   PageImpl ownerPage;
-  private static final Map<EventType, String> eventSubscriptions() {
-    Map<EventType, String> result = new HashMap<>();
-    result.put(EventType.CONSOLE, "console");
-    result.put(EventType.DIALOG, "dialog");
-    result.put(EventType.REQUEST, "request");
-    result.put(EventType.RESPONSE, "response");
-    result.put(EventType.REQUESTFINISHED, "requestFinished");
-    result.put(EventType.REQUESTFAILED, "requestFailed");
-    return result;
-  }
-  private final ListenerCollection<EventType> listeners = new ListenerCollection<>(eventSubscriptions(), this);
+  private final ListenerCollection<EventType> listeners = new ListenerCollection<>();
   final TimeoutSettings timeoutSettings = new TimeoutSettings();
   Path videosDir;
   URL baseUrl;
-  final Map<String, HarRecorder> harRecorders = new HashMap<>();
-
-  static class HarRecorder {
-    final Path path;
-    final HarContentPolicy contentPolicy;
-
-    HarRecorder(Path har, HarContentPolicy policy) {
-      path = har;
-      contentPolicy = policy;
-    }
-  }
+  Path recordHarPath;
 
   enum EventType {
     CLOSE,
-    CONSOLE,
-    DIALOG,
     PAGE,
     REQUEST,
     REQUESTFAILED,
@@ -95,15 +74,7 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
     } else {
       browser = null;
     }
-    tracing = connection.getExistingObject(initializer.getAsJsonObject("tracing").get("guid").getAsString());
-    request = connection.getExistingObject(initializer.getAsJsonObject("requestContext").get("guid").getAsString());
-    closePromise = new WaitableEvent<>(listeners, EventType.CLOSE);
-  }
-
-  void setRecordHar(Path path, HarContentPolicy policy) {
-    if (path != null) {
-      harRecorders.put("", new HarRecorder(path, policy));
-    }
+    this.tracing = new TracingImpl(this);
   }
 
   void setBaseUrl(String spec) {
@@ -124,26 +95,6 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
     listeners.remove(EventType.CLOSE, handler);
   }
 
-  @Override
-  public void onConsoleMessage(Consumer<ConsoleMessage> handler) {
-    listeners.add(EventType.CONSOLE, handler);
-  }
-
-  @Override
-  public void offConsoleMessage(Consumer<ConsoleMessage> handler) {
-    listeners.remove(EventType.CONSOLE, handler);
-  }
-
-  @Override
-  public void onDialog(Consumer<Dialog> handler) {
-    listeners.add(EventType.DIALOG, handler);
-  }
-
-  @Override
-  public void offDialog(Consumer<Dialog> handler) {
-    listeners.remove(EventType.DIALOG, handler);
-  }
-
   @Override
   public void onPage(Consumer<Page> handler) {
     listeners.add(EventType.PAGE, handler);
@@ -204,7 +155,7 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
 
   @Override
   public Page waitForPage(WaitForPageOptions options, Runnable code) {
-    return withWaitLogging("BrowserContext.close", logger -> waitForPageImpl(options, code));
+    return withWaitLogging("BrowserContext.close", () -> waitForPageImpl(options, code));
   }
 
   private Page waitForPageImpl(WaitForPageOptions options, Runnable code) {
@@ -221,36 +172,33 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
 
   @Override
   public List<Cookie> cookies(String url) {
-    return cookies(url == null ? new ArrayList<>() : Collections.singletonList(url));
+    return cookies(url == null ? new ArrayList<>() : asList(url));
   }
 
   private void closeImpl() {
-    if (!closeWasCalled) {
-      closeWasCalled = true;
-      for (Map.Entry<String, HarRecorder> entry : harRecorders.entrySet()) {
-        JsonObject params = new JsonObject();
-        params.addProperty("harId", entry.getKey());
-        JsonObject json = sendMessage("harExport", params).getAsJsonObject();
+    if (isClosedOrClosing) {
+      return;
+    }
+    isClosedOrClosing = true;
+    try {
+      if (recordHarPath != null)  {
+        JsonObject json = sendMessage("harExport").getAsJsonObject();
         ArtifactImpl artifact = connection.getExistingObject(json.getAsJsonObject("artifact").get("guid").getAsString());
-        // Server side will compress artifact if content is attach or if file is .zip.
-        HarRecorder harParams = entry.getValue();
-        boolean isCompressed = harParams.contentPolicy == HarContentPolicy.ATTACH || harParams.path.toString().endsWith(".zip");
-        boolean needCompressed = harParams.path.toString().endsWith(".zip");
-        if (isCompressed && !needCompressed) {
-          String tmpPath = harParams.path + ".tmp";
-          artifact.saveAs(Paths.get(tmpPath));
-          JsonObject unzipParams = new JsonObject();
-          unzipParams.addProperty("zipFile", tmpPath);
-          unzipParams.addProperty("harFile", harParams.path.toString());
-          connection.localUtils.sendMessage("harUnzip", unzipParams);
-        } else {
-          artifact.saveAs(harParams.path);
+        // In case of CDP connection browser is null but since the connection is established by
+        // the driver it is safe to consider the artifact local.
+        if (browser() != null && browser().isRemote) {
+          artifact.isRemote = true;
         }
+        artifact.saveAs(recordHarPath);
         artifact.delete();
       }
+
       sendMessage("close");
+    } catch (PlaywrightException e) {
+      if (!isSafeCloseError(e)) {
+        throw e;
+      }
     }
-    runUntil(() -> {}, closePromise);
   }
 
   @Override
@@ -381,14 +329,9 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
     return new ArrayList<>(pages);
   }
 
-  @Override
-  public APIRequestContextImpl request() {
-    return request;
-  }
-
   @Override
   public void route(String url, Consumer<Route> handler, RouteOptions options) {
-    route(new UrlMatcher(baseUrl, url), handler, options);
+    route(new UrlMatcher(this.baseUrl, url), handler, options);
   }
 
   @Override
@@ -401,54 +344,19 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
     route(new UrlMatcher(url), handler, options);
   }
 
-  @Override
-  public void routeFromHAR(Path har, RouteFromHAROptions options) {
-    if (options == null) {
-      options = new RouteFromHAROptions();
-    }
-    if (options.update != null && options.update) {
-      recordIntoHar(null, har, options);
-      return;
-    }
-    UrlMatcher matcher = UrlMatcher.forOneOf(baseUrl, options.url);
-    HARRouter harRouter = new HARRouter(connection.localUtils, har, options.notFound);
-    onClose(context -> harRouter.dispose());
-    route(matcher, route -> harRouter.handle(route), null);
-  }
-
   private void route(UrlMatcher matcher, Consumer<Route> handler, RouteOptions options) {
     withLogging("BrowserContext.route", () -> {
       routes.add(matcher, handler, options == null ? null : options.times);
-      updateInterceptionPatterns();
+      if (routes.size() == 1) {
+        JsonObject params = new JsonObject();
+        params.addProperty("enabled", true);
+        sendMessage("setNetworkInterceptionEnabled", params);
+      }
     });
   }
 
-  void recordIntoHar(PageImpl page, Path har, RouteFromHAROptions options) {
-    JsonObject params = new JsonObject();
-    if (page != null) {
-      params.add("page", page.toProtocolRef());
-    }
-    JsonObject jsonOptions = new JsonObject();
-    jsonOptions.addProperty("path", har.toAbsolutePath().toString());
-    jsonOptions.addProperty("content", options.updateContent == null ?
-      HarContentPolicy.ATTACH.name().toLowerCase() :
-      options.updateContent.name().toLowerCase());
-    jsonOptions.addProperty("mode", options.updateMode == null ?
-      HarMode.MINIMAL.name().toLowerCase() :
-      options.updateMode.name().toLowerCase());
-    addHarUrlFilter(jsonOptions, options.url);
-    params.add("options", jsonOptions);
-    JsonObject json = sendMessage("harStart", params).getAsJsonObject();
-    String harId = json.get("harId").getAsString();
-    harRecorders.put(harId, new HarRecorder(har, HarContentPolicy.ATTACH));
-  }
-
   @Override
   public void setDefaultNavigationTimeout(double timeout) {
-    setDefaultNavigationTimeoutImpl(timeout);
-  }
-
-  void setDefaultNavigationTimeoutImpl(Double timeout) {
     withLogging("BrowserContext.setDefaultNavigationTimeout", () -> {
       timeoutSettings.setDefaultNavigationTimeout(timeout);
       JsonObject params = new JsonObject();
@@ -459,10 +367,6 @@ 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();
@@ -520,7 +424,7 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
   }
 
   @Override
-  public TracingImpl tracing() {
+  public Tracing tracing() {
     return tracing;
   }
 
@@ -539,27 +443,6 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
     unroute(new UrlMatcher(url), handler);
   }
 
-  @Override
-  public void waitForCondition(BooleanSupplier predicate, WaitForConditionOptions options) {
-    List<Waitable<Void>> waitables = new ArrayList<>();
-    waitables.add(new WaitableContextClose<>());
-    waitables.add(timeoutSettings.createWaitable(options == null ? null : options.timeout));
-    waitables.add(new WaitablePredicate<>(predicate));
-    runUntil(() -> {}, new WaitableRace<>(waitables));
-  }
-
-  @Override
-  public ConsoleMessage waitForConsoleMessage(WaitForConsoleMessageOptions options, Runnable code) {
-    return withWaitLogging("BrowserContext.waitForConsoleMessage", logger -> waitForConsoleMessageImpl(options, code));
-  }
-
-  private ConsoleMessage waitForConsoleMessageImpl(WaitForConsoleMessageOptions options, Runnable code) {
-    if (options == null) {
-      options = new WaitForConsoleMessageOptions();
-    }
-    return waitForEventWithTimeout(EventType.CONSOLE, code, options.predicate, options.timeout);
-  }
-
   private class WaitableContextClose<R> extends WaitableEvent<EventType, R> {
     WaitableContextClose() {
       super(BrowserContextImpl.this.listeners, EventType.CLOSE);
@@ -574,61 +457,35 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
   private void unroute(UrlMatcher matcher, Consumer<Route> handler) {
     withLogging("BrowserContext.unroute", () -> {
       routes.remove(matcher, handler);
-      updateInterceptionPatterns();
+      maybeDisableNetworkInterception();
     });
   }
 
-  private void updateInterceptionPatterns() {
-    sendMessage("setNetworkInterceptionPatterns", routes.interceptionPatterns());
-  }
-
-  void handleRoute(RouteImpl route) {
-    Router.HandleResult handled = routes.handle(route);
-    if (handled != Router.HandleResult.NoMatchingHandler) {
-      updateInterceptionPatterns();
-    }
-    if (handled == Router.HandleResult.NoMatchingHandler || handled == Router.HandleResult.Fallback) {
-      route.resume(null, true);
+  private void maybeDisableNetworkInterception() {
+    if (routes.size() == 0) {
+      JsonObject params = new JsonObject();
+      params.addProperty("enabled", false);
+      sendMessage("setNetworkInterceptionEnabled", params);
     }
   }
 
-  WaitableResult<JsonElement> pause() {
-    return sendMessageAsync("pause", new JsonObject());
+  void handleRoute(Route route) {
+    boolean handled = routes.handle(route);
+    if (handled) {
+      maybeDisableNetworkInterception();
+    } else {
+      route.resume();
+    }
+  }
+
+  void pause() {
+    sendMessage("pause");
   }
 
   @Override
   protected void handleEvent(String event, JsonObject params) {
-    if ("dialog".equals(event)) {
-      String guid = params.getAsJsonObject("dialog").get("guid").getAsString();
-      DialogImpl dialog = connection.getExistingObject(guid);
-      boolean hasListeners = false;
-      if (listeners.hasListeners(EventType.DIALOG)) {
-        hasListeners = true;
-        listeners.notify(EventType.DIALOG, dialog);
-      }
-      PageImpl page = dialog.page();
-      if (page != null) {
-        if (page.listeners.hasListeners(PageImpl.EventType.DIALOG)) {
-          hasListeners = true;
-          page.listeners.notify(PageImpl.EventType.DIALOG, dialog);
-        }
-      }
-      // Although we do similar handling on the server side, we still need this logic
-      // on the client side due to a possible race condition between two async calls:
-      // a) removing "dialog" listener subscription (client->server)
-      // b) actual "dialog" event (server->client)
-      if (!hasListeners) {
-        if ("beforeunload".equals(dialog.type())) {
-          try {
-            dialog.accept();
-          } catch (PlaywrightException e) {
-          }
-        } else {
-          dialog.dismiss();
-        }
-      }
-    } else if ("route".equals(event)) {
-      RouteImpl route = connection.getExistingObject(params.getAsJsonObject("route").get("guid").getAsString());
+    if ("route".equals(event)) {
+      Route route = connection.getExistingObject(params.getAsJsonObject("route").get("guid").getAsString());
       handleRoute(route);
     } else if ("page".equals(event)) {
       PageImpl page = connection.getExistingObject(params.getAsJsonObject("page").get("guid").getAsString());
@@ -643,14 +500,6 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
       if (binding != null) {
         bindingCall.call(binding);
       }
-    } else if ("console".equals(event)) {
-      String guid = params.getAsJsonObject("message").get("guid").getAsString();
-      ConsoleMessageImpl message = connection.getExistingObject(guid);
-      listeners.notify(BrowserContextImpl.EventType.CONSOLE, message);
-      PageImpl page = message.page();
-      if (page != null) {
-        page.listeners.notify(PageImpl.EventType.CONSOLE, message);
-      }
     } else if ("request".equals(event)) {
       String guid = params.getAsJsonObject("request").get("guid").getAsString();
       RequestImpl request = connection.getExistingObject(guid);
@@ -700,16 +549,10 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
   }
 
   void didClose() {
+    isClosedOrClosing = true;
     if (browser != null) {
       browser.contexts.remove(this);
     }
     listeners.notify(EventType.CLOSE, this);
   }
-
-  WritableStream createTempFile(String name) {
-    JsonObject params = new JsonObject();
-    params.addProperty("name", name);
-    JsonObject json = sendMessage("createTempFile", params).getAsJsonObject();
-    return connection.getExistingObject(json.getAsJsonObject("writableStream").get("guid").getAsString());
-  }
 }

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

@@ -19,29 +19,27 @@ package com.microsoft.playwright.impl;
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
-import com.microsoft.playwright.*;
-import com.microsoft.playwright.options.HarContentPolicy;
+import com.microsoft.playwright.Browser;
+import com.microsoft.playwright.BrowserContext;
+import com.microsoft.playwright.Page;
+import com.microsoft.playwright.PlaywrightException;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
-import java.nio.file.Path;
 import java.util.*;
 import java.util.function.Consumer;
-import java.util.regex.Pattern;
 
-import static com.microsoft.playwright.impl.Serialization.addHarUrlFilter;
 import static com.microsoft.playwright.impl.Serialization.gson;
-import static com.microsoft.playwright.impl.Utils.*;
-import static com.microsoft.playwright.impl.Utils.convertType;
+import static com.microsoft.playwright.impl.Utils.convertViaJson;
+import static com.microsoft.playwright.impl.Utils.isSafeCloseError;
 
 class BrowserImpl extends ChannelOwner implements Browser {
   final Set<BrowserContextImpl> contexts = new HashSet<>();
   private final ListenerCollection<EventType> listeners = new ListenerCollection<>();
+  boolean isRemote;
   boolean isConnectedOverWebSocket;
   private boolean isConnected = true;
-  BrowserTypeImpl browserType;
-  BrowserType.LaunchOptions launchOptions;
 
   enum EventType {
     DISCONNECTED,
@@ -61,11 +59,6 @@ class BrowserImpl extends ChannelOwner implements Browser {
     listeners.remove(EventType.DISCONNECTED, handler);
   }
 
-  @Override
-  public BrowserType browserType() {
-    return browserType;
-  }
-
   @Override
   public void close() {
     withLogging("Browser.close", () -> closeImpl());
@@ -118,9 +111,6 @@ class BrowserImpl extends ChannelOwner implements Browser {
   private BrowserContextImpl newContextImpl(NewContextOptions options) {
     if (options == null) {
       options = new NewContextOptions();
-    } else {
-      // Make a copy so that we can nullify some fields below.
-      options = convertType(options, NewContextOptions.class);
     }
     if (options.storageStatePath != null) {
       try {
@@ -136,50 +126,21 @@ class BrowserImpl extends ChannelOwner implements Browser {
       storageState = new Gson().fromJson(options.storageState, JsonObject.class);
       options.storageState = null;
     }
-    JsonObject recordHar = null;
-    Path recordHarPath = options.recordHarPath;
-    HarContentPolicy harContentPolicy = null;
-    if (options.recordHarPath != null) {
-      recordHar = new JsonObject();
-      recordHar.addProperty("path", options.recordHarPath.toString());
-      if (options.recordHarContent != null) {
-        harContentPolicy = options.recordHarContent;
-      } else if (options.recordHarOmitContent != null && options.recordHarOmitContent) {
-        harContentPolicy = HarContentPolicy.OMIT;
-      }
-      if (harContentPolicy != null) {
-        recordHar.addProperty("content", harContentPolicy.name().toLowerCase());
-      }
-      if (options.recordHarMode != null) {
-        recordHar.addProperty("mode", options.recordHarMode.name().toLowerCase());
-      }
-      addHarUrlFilter(recordHar, options.recordHarUrlFilter);
-      options.recordHarPath = null;
-      options.recordHarMode = null;
-      options.recordHarOmitContent = null;
-      options.recordHarContent = null;
-      options.recordHarUrlFilter = null;
-    } else {
-      if (options.recordHarOmitContent != null) {
-        throw new PlaywrightException("recordHarOmitContent is set but recordHarPath is null");
-      }
-      if (options.recordHarUrlFilter != null) {
-        throw new PlaywrightException("recordHarUrlFilter is set but recordHarPath is null");
-      }
-      if (options.recordHarMode != null) {
-        throw new PlaywrightException("recordHarMode is set but recordHarPath is null");
-      }
-      if (options.recordHarContent != null) {
-        throw new PlaywrightException("recordHarContent is set but recordHarPath is null");
-      }
-    }
-
     JsonObject params = gson().toJsonTree(options).getAsJsonObject();
     if (storageState != null) {
       params.add("storageState", storageState);
     }
-    if (recordHar != null) {
+    if (options.recordHarPath != null) {
+      JsonObject recordHar = new JsonObject();
+      recordHar.addProperty("path", options.recordHarPath.toString());
+      if (options.recordHarOmitContent != null) {
+        recordHar.addProperty("omitContent", true);
+      }
+      params.remove("recordHarPath");
+      params.remove("recordHarOmitContent");
       params.add("recordHar", recordHar);
+    } else if (options.recordHarOmitContent != null) {
+      throw new PlaywrightException("recordHarOmitContent is set but recordHarPath is null");
     }
     if (options.recordVideoDir != null) {
       JsonObject recordVideo = new JsonObject();
@@ -209,10 +170,7 @@ class BrowserImpl extends ChannelOwner implements Browser {
     if (options.baseURL != null) {
       context.setBaseUrl(options.baseURL);
     }
-    context.setRecordHar(recordHarPath, harContentPolicy);
-    if (launchOptions != null) {
-      context.tracing().setTracesDir(launchOptions.tracesDir);
-    }
+    context.recordHarPath = options.recordHarPath;
     contexts.add(context);
     return context;
   }
@@ -233,7 +191,9 @@ class BrowserImpl extends ChannelOwner implements Browser {
     }
     JsonObject params = gson().toJsonTree(options).getAsJsonObject();
     if (page != null) {
-      params.add("page", ((PageImpl) page).toProtocolRef());
+      JsonObject jsonPage = new JsonObject();
+      jsonPage.addProperty("guid", ((PageImpl) page).guid);
+      params.add("page", jsonPage);
     }
     sendMessage("startTracing", params);
   }
@@ -249,7 +209,7 @@ class BrowserImpl extends ChannelOwner implements Browser {
   }
 
   private Page newPageImpl(NewPageOptions options) {
-    BrowserContextImpl context = newContext(convertType(options, NewContextOptions.class));
+    BrowserContextImpl context = newContext(convertViaJson(options, NewContextOptions.class));
     PageImpl page = context.newPage();
     page.ownedContext = context;
     context.ownerPage = page;

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

@@ -22,19 +22,14 @@ import com.google.gson.JsonObject;
 import com.microsoft.playwright.Browser;
 import com.microsoft.playwright.BrowserType;
 import com.microsoft.playwright.PlaywrightException;
-import com.microsoft.playwright.options.HarContentPolicy;
 
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.function.Consumer;
 
-import static com.microsoft.playwright.impl.Serialization.addHarUrlFilter;
 import static com.microsoft.playwright.impl.Serialization.gson;
-import static com.microsoft.playwright.impl.Utils.convertType;
 
 class BrowserTypeImpl extends ChannelOwner implements BrowserType {
-  LocalUtils localUtils;
-
   BrowserTypeImpl(ChannelOwner parent, String type, String guid, JsonObject initializer) {
     super(parent, type, guid, initializer);
   }
@@ -50,10 +45,7 @@ class BrowserTypeImpl extends ChannelOwner implements BrowserType {
     }
     JsonObject params = gson().toJsonTree(options).getAsJsonObject();
     JsonElement result = sendMessage("launch", params);
-    BrowserImpl browser = connection.getExistingObject(result.getAsJsonObject().getAsJsonObject("browser").get("guid").getAsString());
-    browser.browserType = this;
-    browser.launchOptions = options;
-    return browser;
+    return connection.getExistingObject(result.getAsJsonObject().getAsJsonObject("browser").get("guid").getAsString());
   }
 
   @Override
@@ -68,25 +60,9 @@ class BrowserTypeImpl extends ChannelOwner implements BrowserType {
     // We don't use gson() here as the headers map should be serialized to a json object.
     JsonObject params = new Gson().toJsonTree(options).getAsJsonObject();
     params.addProperty("wsEndpoint", wsEndpoint);
-
-    if (!params.has("headers")) {
-      params.add("headers", new JsonObject());
-    }
-    JsonObject headers = params.get("headers").getAsJsonObject();
-    boolean foundBrowserHeader = false;
-    for (String name : headers.keySet()) {
-      if ("x-playwright-browser".equalsIgnoreCase(name)) {
-        foundBrowserHeader = true;
-        break;
-      }
-    }
-    if (!foundBrowserHeader) {
-      headers.addProperty("x-playwright-browser", name());
-    }
-
-    JsonObject json = connection.localUtils().sendMessage("connect", params).getAsJsonObject();
+    JsonObject json = sendMessage("connect", params).getAsJsonObject();
     JsonPipe pipe = connection.getExistingObject(json.getAsJsonObject("pipe").get("guid").getAsString());
-    Connection connection = new Connection(pipe, this.connection.env, this.connection.localUtils);
+    Connection connection = new Connection(pipe);
     PlaywrightImpl playwright = connection.initializePlaywright();
     if (!playwright.initializer.has("preLaunchedBrowser")) {
       try {
@@ -98,8 +74,8 @@ class BrowserTypeImpl extends ChannelOwner implements BrowserType {
     }
     playwright.initSharedSelectors(this.connection.getExistingObject("Playwright"));
     BrowserImpl browser = connection.getExistingObject(playwright.initializer.getAsJsonObject("preLaunchedBrowser").get("guid").getAsString());
+    browser.isRemote = true;
     browser.isConnectedOverWebSocket = true;
-    browser.browserType = this;
     Consumer<JsonPipe> connectionCloseListener = t -> browser.notifyRemoteClosed();
     pipe.onClose(connectionCloseListener);
     browser.onDisconnected(b -> {
@@ -132,7 +108,7 @@ class BrowserTypeImpl extends ChannelOwner implements BrowserType {
     JsonObject json = sendMessage("connectOverCDP", params).getAsJsonObject();
 
     BrowserImpl browser = connection.getExistingObject(json.getAsJsonObject("browser").get("guid").getAsString());
-    browser.browserType = this;
+    browser.isRemote = true;
     if (json.has("defaultContext")) {
       String contextId = json.getAsJsonObject("defaultContext").get("guid").getAsString();
       BrowserContextImpl defaultContext = connection.getExistingObject(contextId);
@@ -154,52 +130,20 @@ class BrowserTypeImpl extends ChannelOwner implements BrowserType {
   private BrowserContextImpl launchPersistentContextImpl(Path userDataDir, LaunchPersistentContextOptions options) {
     if (options == null) {
       options = new LaunchPersistentContextOptions();
-    } else {
-      // Make a copy so that we can nullify some fields below.
-      options = convertType(options, LaunchPersistentContextOptions.class);
     }
-    JsonObject recordHar = null;
-    Path recordHarPath = options.recordHarPath;
-    HarContentPolicy harContentPolicy = null;
-    if (options.recordHarPath != null) {
-      recordHar = new JsonObject();
-      recordHar.addProperty("path", options.recordHarPath.toString());
-      if (options.recordHarContent != null) {
-        harContentPolicy = options.recordHarContent;
-      } else if (options.recordHarOmitContent != null && options.recordHarOmitContent) {
-        harContentPolicy = HarContentPolicy.OMIT;
-      }
-      if (harContentPolicy != null) {
-        recordHar.addProperty("content", harContentPolicy.name().toLowerCase());
-      }
-      if (options.recordHarMode != null) {
-        recordHar.addProperty("mode", options.recordHarMode.toString().toLowerCase());
-      }
-      addHarUrlFilter(recordHar, options.recordHarUrlFilter);
-      options.recordHarPath = null;
-      options.recordHarMode = null;
-      options.recordHarOmitContent = null;
-      options.recordHarContent = null;
-      options.recordHarUrlFilter = null;
-    } else {
-      if (options.recordHarOmitContent != null) {
-        throw new PlaywrightException("recordHarOmitContent is set but recordHarPath is null");
-      }
-      if (options.recordHarUrlFilter != null) {
-        throw new PlaywrightException("recordHarUrlFilter is set but recordHarPath is null");
-      }
-      if (options.recordHarMode != null) {
-        throw new PlaywrightException("recordHarMode is set but recordHarPath is null");
-      }
-      if (options.recordHarContent != null) {
-        throw new PlaywrightException("recordHarContent is set but recordHarPath is null");
-      }
-    }
-
     JsonObject params = gson().toJsonTree(options).getAsJsonObject();
     params.addProperty("userDataDir", userDataDir.toString());
-    if (recordHar != null) {
+    if (options.recordHarPath != null) {
+      JsonObject recordHar = new JsonObject();
+      recordHar.addProperty("path", options.recordHarPath.toString());
+      if (options.recordHarOmitContent != null) {
+        recordHar.addProperty("omitContent", true);
+      }
+      params.remove("recordHarPath");
+      params.remove("recordHarOmitContent");
       params.add("recordHar", recordHar);
+    } else if (options.recordHarOmitContent != null) {
+      throw new PlaywrightException("recordHarOmitContent is set but recordHarPath is null");
     }
     if (options.recordVideoDir != null) {
       JsonObject recordVideo = new JsonObject();
@@ -229,8 +173,7 @@ class BrowserTypeImpl extends ChannelOwner implements BrowserType {
     if (options.baseURL != null) {
       context.setBaseUrl(options.baseURL);
     }
-    context.setRecordHar(recordHarPath, harContentPolicy);
-    context.tracing().setTracesDir(options.tracesDir);
+    context.recordHarPath = options.recordHarPath;
     return context;
   }
 

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

@@ -22,13 +22,11 @@ import com.google.gson.JsonObject;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.function.BinaryOperator;
-import java.util.function.Function;
 import java.util.function.Supplier;
 
 class ChannelOwner extends LoggingSupport {
   final Connection connection;
-  private ChannelOwner parent;
+  private final ChannelOwner parent;
   private final Map<String, ChannelOwner> objects = new HashMap<>();
 
   final String type;
@@ -70,13 +68,7 @@ class ChannelOwner extends LoggingSupport {
     objects.clear();
   }
 
-  void adopt(ChannelOwner child) {
-    child.parent.objects.remove(child.guid);
-    objects.put(child.guid, child);
-    child.parent = this;
-  }
-
-  <T> T withWaitLogging(String apiName, Function<Logger, T> code) {
+  <T> T withWaitLogging(String apiName, Supplier<T> code) {
     return new WaitForEventLogger<>(this, apiName, code).get();
   }
 
@@ -116,10 +108,4 @@ class ChannelOwner extends LoggingSupport {
 
   void handleEvent(String event, JsonObject parameters) {
   }
-
-  JsonObject toProtocolRef() {
-    JsonObject json = new JsonObject();
-    json.addProperty("guid", guid);
-    return json;
-  }
 }

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

@@ -23,13 +23,17 @@ import com.microsoft.playwright.Playwright;
 import com.microsoft.playwright.PlaywrightException;
 import com.microsoft.playwright.TimeoutError;
 
+import java.io.File;
 import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.time.Duration;
 import java.util.HashMap;
 import java.util.Map;
 
+import static com.microsoft.playwright.impl.LoggingSupport.logWithTimestamp;
 import static com.microsoft.playwright.impl.Serialization.gson;
-import static java.lang.System.currentTimeMillis;
 
 class Message {
   int id;
@@ -57,9 +61,8 @@ public class Connection {
   private final Transport transport;
   private final Map<String, ChannelOwner> objects = new HashMap<>();
   private final Root root;
-  final boolean isRemote;
   private int lastId = 0;
-  private final StackTraceCollector stackTraceCollector;
+  private final Path srcDir;
   private final Map<Integer, WaitableResult<JsonElement>> callbacks = new HashMap<>();
   private String apiName;
   private static final boolean isLogging;
@@ -67,9 +70,6 @@ public class Connection {
     String debug = System.getenv("DEBUG");
     isLogging = (debug != null) && debug.contains("pw:channel");
   }
-  LocalUtils localUtils;
-  final Map<String, String> env;
-  private int tracingCount;
 
   class Root extends ChannelOwner {
     Root(Connection connection) {
@@ -84,31 +84,20 @@ public class Connection {
     }
   }
 
-  Connection(Transport pipe, Map<String, String> env, LocalUtils localUtils) {
-    this(pipe, env, true);
-    this.localUtils = localUtils;
-  }
-
-  Connection(Transport transport, Map<String, String> env) {
-    this(transport, env, false);
-  }
-
-  private Connection(Transport transport, Map<String, String> env, boolean isRemote) {
-    this.env = env;
-    this.isRemote = isRemote;
+  Connection(Transport transport) {
     if (isLogging) {
       transport = new TransportLogger(transport);
     }
     this.transport = transport;
     root = new Root(this);
-    stackTraceCollector = StackTraceCollector.createFromEnv(env);
-  }
-
-  void setIsTracing(boolean tracing) {
-    if (tracing) {
-      ++tracingCount;
+    String srcRoot = System.getenv("PLAYWRIGHT_JAVA_SRC");
+    if (srcRoot == null) {
+      srcDir = null;
     } else {
-      --tracingCount;
+      srcDir = Paths.get(srcRoot);
+      if (!Files.exists(srcDir)) {
+        throw new PlaywrightException("PLAYWRIGHT_JAVA_SRC environment variable points to non-existing location: '" + srcRoot + "'");
+      }
     }
   }
 
@@ -127,10 +116,49 @@ public class Connection {
   }
 
   public WaitableResult<JsonElement> sendMessageAsync(String guid, String method, JsonObject params) {
-    return internalSendMessage(guid, method, params, true);
+    return internalSendMessage(guid, method, params);
   }
 
-  private WaitableResult<JsonElement> internalSendMessage(String guid, String method, JsonObject params, boolean sendStack) {
+  private String sourceFile(StackTraceElement frame) {
+    String pkg = frame.getClassName();
+    int lastDot = pkg.lastIndexOf('.');
+    if (lastDot == -1) {
+      pkg = "";
+    } else {
+      pkg = frame.getClassName().substring(0, lastDot + 1);
+    }
+    pkg = pkg.replace('.', File.separatorChar);
+    return srcDir.resolve(pkg).resolve(frame.getFileName()).toString();
+  }
+
+  private JsonArray currentStackTrace() {
+    StackTraceElement[] stack = Thread.currentThread().getStackTrace();
+
+    int index = 0;
+    while (index < stack.length && !stack[index].getClassName().equals(getClass().getName())) {
+      index++;
+    };
+    // Find Playwright API call
+    while (index < stack.length && stack[index].getClassName().startsWith("com.microsoft.playwright.")) {
+      // hack for tests
+      if (stack[index].getClassName().startsWith("com.microsoft.playwright.Test")) {
+        break;
+      }
+      index++;
+    }
+    JsonArray jsonStack = new JsonArray();
+    for (; index < stack.length; index++) {
+      StackTraceElement frame = stack[index];
+      JsonObject jsonFrame = new JsonObject();
+      jsonFrame.addProperty("file", sourceFile(frame));
+      jsonFrame.addProperty("line", frame.getLineNumber());
+      jsonFrame.addProperty("function", frame.getClassName() + "." + frame.getMethodName());
+      jsonStack.add(jsonFrame);
+    }
+    return jsonStack;
+  }
+
+  private WaitableResult<JsonElement> internalSendMessage(String guid, String method, JsonObject params) {
     int id = ++lastId;
     WaitableResult<JsonElement> result = new WaitableResult<>();
     callbacks.put(id, result);
@@ -140,36 +168,14 @@ public class Connection {
     message.addProperty("method", method);
     message.add("params", params);
     JsonObject metadata = new JsonObject();
-    metadata.addProperty("wallTime", currentTimeMillis());
-    JsonArray stack = null;
-    if (apiName == null) {
-      metadata.addProperty("internal", true);
-    } else {
+    if (srcDir != null) {
+      metadata.add("stack", currentStackTrace());
+    }
+    if (apiName != null) {
       metadata.addProperty("apiName", apiName);
-      // All but first message in an API call are considered internal and will be hidden from the inspector.
-      apiName = null;
-      if (stackTraceCollector != null) {
-        stack = stackTraceCollector.currentStackTrace();
-        if (!stack.isEmpty()) {
-          JsonObject location = new JsonObject();
-          JsonObject frame = stack.get(0).getAsJsonObject();
-          location.addProperty("file", frame.get("file").getAsString());
-          location.addProperty("line", frame.get("line").getAsInt());
-          location.addProperty("column", frame.get("column").getAsInt());
-          metadata.add("location", location);
-        }
-      }
     }
     message.add("metadata", metadata);
     transport.send(message);
-    if (sendStack && tracingCount > 0 && stack != null && !method.startsWith("LocalUtils")) {
-      JsonObject callData = new JsonObject();
-      callData.addProperty("id", id);
-      callData.add("stack", stack);
-      JsonObject stackParams = new JsonObject();
-      stackParams.add("callData", callData);
-      internalSendMessage(localUtils.guid,"addStackToTracingNoReply", stackParams, false);
-    }
     return result;
   }
 
@@ -177,10 +183,6 @@ public class Connection {
     return (PlaywrightImpl) this.root.initialize();
   }
 
-  LocalUtils localUtils() {
-    return localUtils;
-  }
-
   public <T> T getExistingObject(String guid) {
     @SuppressWarnings("unchecked") T result = (T) objects.get(guid);
     if (result == null)
@@ -237,24 +239,18 @@ public class Connection {
       createRemoteObject(message.guid, message.params);
       return;
     }
-
+    if (message.method.equals("__dispose__")) {
+      ChannelOwner object = objects.get(message.guid);
+      if (object == null) {
+        throw new PlaywrightException("Cannot find object to dispose: " + message.guid);
+      }
+      object.disconnect();
+      return;
+    }
     ChannelOwner object = objects.get(message.guid);
     if (object == null) {
       throw new PlaywrightException("Cannot find object to call " + message.method + ": " + message.guid);
     }
-    if (message.method.equals("__adopt__")) {
-      String childGuid = message.params.get("guid").getAsString();
-      ChannelOwner child = objects.get(childGuid);
-      if (child == null) {
-        throw new PlaywrightException("Unknown new child:  " + childGuid);
-      }
-      object.adopt(child);
-      return;
-    }
-    if (message.method.equals("__dispose__")) {
-      object.disconnect();
-      return;
-    }
     object.handleEvent(message.method, message.params);
   }
 
@@ -307,7 +303,7 @@ public class Connection {
         break;
       case "APIRequestContext":
         // Create fake object as this API is experimental an only exposed in Node.js.
-        result = new APIRequestContextImpl(parent, type, guid, initializer);
+        result = new ChannelOwner(parent, type, guid, initializer);
         break;
       case "Frame":
         result = new FrameImpl(parent, type, guid, initializer);
@@ -318,12 +314,6 @@ public class Connection {
       case "JsonPipe":
         result = new JsonPipe(parent, type, guid, initializer);
         break;
-      case "LocalUtils":
-        result = new LocalUtils(parent, type, guid, initializer);
-        if (localUtils == null) {
-          localUtils = (LocalUtils) result;
-        }
-        break;
       case "Page":
         result = new PageImpl(parent, type, guid, initializer);
         break;
@@ -345,20 +335,12 @@ public class Connection {
       case "Selectors":
         result = new SelectorsImpl(parent, type, guid, initializer);
         break;
-      case "SocksSupport":
-        break;
-      case "Tracing":
-        result = new TracingImpl(parent, type, guid, initializer);
-        break;
       case "WebSocket":
         result = new WebSocketImpl(parent, type, guid, initializer);
         break;
       case "Worker":
         result = new WorkerImpl(parent, type, guid, initializer);
         break;
-      case "WritableStream":
-        result = new WritableStream(parent, type, guid, initializer);
-        break;
       default:
         throw new PlaywrightException("Unknown type " + type);
     }

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

@@ -20,7 +20,6 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.microsoft.playwright.ConsoleMessage;
 import com.microsoft.playwright.JSHandle;
-import com.microsoft.playwright.Page;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -28,16 +27,8 @@ import java.util.List;
 import static com.microsoft.playwright.impl.Serialization.gson;
 
 public class ConsoleMessageImpl extends ChannelOwner implements ConsoleMessage {
-  private PageImpl page;
-
   public ConsoleMessageImpl(ChannelOwner parent, String type, String guid, JsonObject initializer) {
     super(parent, type, guid, initializer);
-    // Note: currently, we only report console messages for pages and they always have a page.
-    // However, in the future we might report console messages for service workers or something else,
-    // where page() would be null.
-    if (initializer.has("page")) {
-      page = connection.getExistingObject(initializer.getAsJsonObject("page").get("guid").getAsString());
-    }
   }
 
   public String type() {
@@ -64,9 +55,4 @@ public class ConsoleMessageImpl extends ChannelOwner implements ConsoleMessage {
       location.get("lineNumber").getAsNumber() + ":" +
       location.get("columnNumber").getAsNumber();
   }
-
-  @Override
-  public PageImpl page() {
-    return page;
-  }
 }

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

@@ -18,18 +18,10 @@ package com.microsoft.playwright.impl;
 
 import com.google.gson.JsonObject;
 import com.microsoft.playwright.Dialog;
-import com.microsoft.playwright.Page;
 
 class DialogImpl extends ChannelOwner implements Dialog {
-  private PageImpl page;
-
   DialogImpl(ChannelOwner parent, String type, String guid, JsonObject initializer) {
     super(parent, type, guid, initializer);
-    // Note: dialogs that open early during page initialization block it.
-    // Therefore, we must report the dialog without a page to be able to handle it.
-    if (initializer.has("page")) {
-      page = connection.getExistingObject(initializer.getAsJsonObject("page").get("guid").getAsString());
-    }
   }
 
   @Override
@@ -58,11 +50,6 @@ class DialogImpl extends ChannelOwner implements Dialog {
     return initializer.get("message").getAsString();
   }
 
-  @Override
-  public PageImpl page() {
-    return page;
-  }
-
   @Override
   public String type() {
     return initializer.get("type").getAsString();

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

@@ -20,6 +20,7 @@ import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.microsoft.playwright.ElementHandle;
+import com.microsoft.playwright.FileChooser;
 import com.microsoft.playwright.Frame;
 import com.microsoft.playwright.options.BoundingBox;
 import com.microsoft.playwright.options.ElementState;
@@ -33,8 +34,7 @@ import java.util.Base64;
 import java.util.List;
 
 import static com.microsoft.playwright.impl.Serialization.*;
-import static com.microsoft.playwright.impl.Utils.*;
-import static com.microsoft.playwright.impl.Utils.addLargeFileUploadParams;
+import static com.microsoft.playwright.impl.Utils.convertViaJson;
 import static com.microsoft.playwright.options.ScreenshotType.JPEG;
 import static com.microsoft.playwright.options.ScreenshotType.PNG;
 
@@ -300,7 +300,7 @@ public class ElementHandleImpl extends JSHandleImpl implements ElementHandle {
   }
 
   @Override
-  public FrameImpl ownerFrame() {
+  public Frame ownerFrame() {
     return withLogging("ElementHandle.ownerFrame", () -> {
       JsonObject json = sendMessage("ownerFrame").getAsJsonObject();
       if (!json.has("frame")) {
@@ -375,14 +375,11 @@ public class ElementHandleImpl extends JSHandleImpl implements ElementHandle {
 
   @Override
   public List<String> selectOption(String[] values, SelectOptionOptions options) {
-    if (options == null) {
-      options = new SelectOptionOptions();
+    if (values == null) {
+      return selectOption(new SelectOption[0], options);
     }
-    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
-    if (values != null) {
-      params.add("options", toSelectValueOrLabel(values));
-    }
-    return selectOption(params);
+    return selectOption(Arrays.asList(values).stream().map(
+      v -> new SelectOption().setValue(v)).toArray(SelectOption[]::new), options);
   }
 
   @Override
@@ -438,9 +435,9 @@ public class ElementHandleImpl extends JSHandleImpl implements ElementHandle {
   @Override
   public void setChecked(boolean checked, SetCheckedOptions options) {
     if (checked) {
-      check(convertType(options, CheckOptions.class));
+      check(convertViaJson(options, CheckOptions.class));
     } else {
-      uncheck(convertType(options, UncheckOptions.class));
+      uncheck(convertViaJson(options, UncheckOptions.class));
     }
   }
 
@@ -459,24 +456,7 @@ public class ElementHandleImpl extends JSHandleImpl implements ElementHandle {
 
   @Override
   public void setInputFiles(Path[] files, SetInputFilesOptions options) {
-    withLogging("ElementHandle.setInputFiles", () -> setInputFilesImpl(files, options));
-  }
-
-  void setInputFilesImpl(Path[] files, SetInputFilesOptions options) {
-    FrameImpl frame = ownerFrame();
-    if (frame == null) {
-      throw new Error("Cannot set input files to detached element");
-    }
-    if (hasLargeFile(files)) {
-      if (options == null) {
-        options = new SetInputFilesOptions();
-      }
-      JsonObject params = gson().toJsonTree(options).getAsJsonObject();
-      addLargeFileUploadParams(files, params, frame.page().context());
-      sendMessage("setInputFilePaths", params);
-    } else {
-      setInputFilesImpl(Utils.toFilePayloads(files), options);
-    }
+    setInputFiles(Utils.toFilePayloads(files), options);
   }
 
   @Override
@@ -490,7 +470,6 @@ public class ElementHandleImpl extends JSHandleImpl implements ElementHandle {
   }
 
   void setInputFilesImpl(FilePayload[] files, SetInputFilesOptions options) {
-    checkFilePayloadSize(files);
     if (options == null) {
       options = new SetInputFilesOptions();
     }

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

@@ -23,7 +23,7 @@ import com.microsoft.playwright.options.FilePayload;
 
 import java.nio.file.Path;
 
-import static com.microsoft.playwright.impl.Utils.convertType;
+import static com.microsoft.playwright.impl.Utils.convertViaJson;
 
 class FileChooserImpl implements FileChooser {
   private final PageImpl page;
@@ -58,8 +58,7 @@ class FileChooserImpl implements FileChooser {
 
   @Override
   public void setFiles(Path[] files, SetFilesOptions options) {
-    page.withLogging("FileChooser.setInputFiles",
-      () -> element.setInputFilesImpl(files, convertType(options, ElementHandle.SetInputFilesOptions.class)));
+    setFiles(Utils.toFilePayloads(files), options);
   }
 
   @Override
@@ -70,6 +69,6 @@ class FileChooserImpl implements FileChooser {
   @Override
   public void setFiles(FilePayload[] files, SetFilesOptions options) {
     page.withLogging("FileChooser.setInputFiles",
-      () -> element.setInputFilesImpl(files, convertType(options, ElementHandle.SetInputFilesOptions.class)));
+      () -> element.setInputFilesImpl(files, convertViaJson(options, ElementHandle.SetInputFilesOptions.class)));
   }
 }

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

@@ -1,58 +0,0 @@
-/*
- * Copyright (c) Microsoft Corporation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.microsoft.playwright.impl;
-
-import com.microsoft.playwright.options.FilePayload;
-import com.microsoft.playwright.options.FormData;
-
-import java.nio.file.Path;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-public class FormDataImpl implements FormData {
-  Map<String, Object> fields = new LinkedHashMap<>();
-
-  @Override
-  public FormData set(String name, String value) {
-    fields.put(name, value);
-    return this;
-  }
-
-  @Override
-  public FormData set(String name, boolean value) {
-    fields.put(name, value);
-    return this;
-  }
-
-  @Override
-  public FormData set(String name, int value) {
-    fields.put(name, value);
-    return this;
-  }
-
-  @Override
-  public FormData set(String name, Path value) {
-    fields.put(name, value);
-    return this;
-  }
-
-  @Override
-  public FormData set(String name, FilePayload value) {
-    fields.put(name, value);
-    return this;
-  }
-}

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

@@ -31,10 +31,9 @@ import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
-import static com.microsoft.playwright.impl.LocatorUtils.*;
-import static com.microsoft.playwright.impl.Utils.*;
 import static com.microsoft.playwright.options.WaitUntilState.*;
 import static com.microsoft.playwright.impl.Serialization.*;
+import static com.microsoft.playwright.impl.Utils.convertViaJson;
 
 public class FrameImpl extends ChannelOwner implements Frame {
   private String name;
@@ -110,7 +109,11 @@ public class FrameImpl extends ChannelOwner implements Frame {
 
   @Override
   public List<String> selectOption(String selector, String[] values, SelectOptionOptions options) {
-    return withLogging("Frame.selectOption", () -> selectOptionImpl(selector, values, options));
+    if (values == null) {
+      return selectOption(selector, new SelectOption[0], options);
+    }
+    return selectOption(selector, Arrays.asList(values).stream().map(
+      v -> new SelectOption().setValue(v)).toArray(SelectOption[]::new), options);
   }
 
   @Override
@@ -370,71 +373,6 @@ public class FrameImpl extends ChannelOwner implements Frame {
     return withLogging("Frame.getAttribute", () -> getAttributeImpl(selector, name, options));
   }
 
-  @Override
-  public Locator getByAltText(String text, GetByAltTextOptions options) {
-    return locator(getByAltTextSelector(text, convertType(options, Locator.GetByAltTextOptions.class)));
-  }
-
-  @Override
-  public Locator getByAltText(Pattern text, GetByAltTextOptions options) {
-    return locator(getByAltTextSelector(text, convertType(options, Locator.GetByAltTextOptions.class)));
-  }
-
-  @Override
-  public Locator getByLabel(String text, GetByLabelOptions options) {
-    return locator(getByLabelSelector(text, convertType(options, Locator.GetByLabelOptions.class)));
-  }
-
-  @Override
-  public Locator getByLabel(Pattern text, GetByLabelOptions options) {
-    return locator(getByLabelSelector(text, convertType(options, Locator.GetByLabelOptions.class)));
-  }
-
-  @Override
-  public Locator getByPlaceholder(String text, GetByPlaceholderOptions options) {
-    return locator(getByPlaceholderSelector(text, convertType(options, Locator.GetByPlaceholderOptions.class)));
-  }
-
-  @Override
-  public Locator getByPlaceholder(Pattern text, GetByPlaceholderOptions options) {
-    return locator(getByPlaceholderSelector(text, convertType(options, Locator.GetByPlaceholderOptions.class)));
-  }
-
-  @Override
-  public Locator getByRole(AriaRole role, GetByRoleOptions options) {
-    return locator(getByRoleSelector(role, convertType(options, Locator.GetByRoleOptions.class)));
-  }
-
-  @Override
-  public Locator getByTestId(String testId) {
-    return locator(getByTestIdSelector(testId));
-  }
-
-  @Override
-  public Locator getByTestId(Pattern testId) {
-    return locator(getByTestIdSelector(testId));
-  }
-
-  @Override
-  public Locator getByText(String text, GetByTextOptions options) {
-    return locator(getByTextSelector(text, convertType(options, Locator.GetByTextOptions.class)));
-  }
-
-  @Override
-  public Locator getByText(Pattern text, GetByTextOptions options) {
-    return locator(getByTextSelector(text, convertType(options, Locator.GetByTextOptions.class)));
-  }
-
-  @Override
-  public Locator getByTitle(String text, GetByTitleOptions options) {
-    return locator(getByTitleSelector(text, convertType(options, Locator.GetByTitleOptions.class)));
-  }
-
-  @Override
-  public Locator getByTitle(Pattern text, GetByTitleOptions options) {
-    return locator(getByTitleSelector(text, convertType(options, Locator.GetByTitleOptions.class)));
-  }
-
   String getAttributeImpl(String selector, String name, GetAttributeOptions options) {
     if (options == null) {
       options = new GetAttributeOptions();
@@ -628,8 +566,8 @@ public class FrameImpl extends ChannelOwner implements Frame {
   }
 
   @Override
-  public Locator locator(String selector, LocatorOptions options) {
-    return new LocatorImpl(this, selector, convertType(options, Locator.LocatorOptions.class));
+  public LocatorImpl locator(String selector) {
+    return new LocatorImpl(this, selector);
   }
 
   boolean isVisibleImpl(String selector, IsVisibleOptions options) {
@@ -648,7 +586,7 @@ public class FrameImpl extends ChannelOwner implements Frame {
   }
 
   @Override
-  public PageImpl page() {
+  public Page page() {
     return page;
   }
 
@@ -689,18 +627,6 @@ public class FrameImpl extends ChannelOwner implements Frame {
     return selectOption(params);
   }
 
-  List<String> selectOptionImpl(String selector, String[] values, SelectOptionOptions options) {
-    if (options == null) {
-      options = new SelectOptionOptions();
-    }
-    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
-    params.addProperty("selector", selector);
-    if (values != null) {
-      params.add("options", toSelectValueOrLabel(values));
-    }
-    return selectOption(params);
-  }
-
   @Override
   public List<String> selectOption(String selector, ElementHandle[] values, SelectOptionOptions options) {
     return withLogging("Frame.selectOption", () -> selectOptionImpl(selector, values, options));
@@ -730,9 +656,9 @@ public class FrameImpl extends ChannelOwner implements Frame {
 
   void setCheckedImpl(String selector, boolean checked, SetCheckedOptions options) {
     if (checked) {
-      checkImpl(selector, convertType(options, CheckOptions.class));
+      checkImpl(selector, convertViaJson(options, CheckOptions.class));
     } else {
-      uncheckImpl(selector, convertType(options, UncheckOptions.class));
+      uncheckImpl(selector, convertViaJson(options, UncheckOptions.class));
     }
   }
 
@@ -760,32 +686,21 @@ public class FrameImpl extends ChannelOwner implements Frame {
     withLogging("Frame.setInputFiles", () -> setInputFilesImpl(selector, files, options));
   }
 
-  void setInputFilesImpl(String selector, Path[] files, SetInputFilesOptions options) {
-    if (hasLargeFile(files)) {
-      if (options == null) {
-        options = new SetInputFilesOptions();
-      }
-      JsonObject params = gson().toJsonTree(options).getAsJsonObject();
-      addLargeFileUploadParams(files, params, page.context());
-      params.addProperty("selector", selector);
-      sendMessage("setInputFilePaths", params);
-    } else {
-      setInputFilesImpl(selector, Utils.toFilePayloads(files), options);
-    }
-  }
-
   @Override
   public void setInputFiles(String selector, FilePayload files, SetInputFilesOptions options) {
     setInputFiles(selector, new FilePayload[]{files}, options);
   }
 
+  void setInputFilesImpl(String selector, Path[] files, SetInputFilesOptions options) {
+    setInputFiles(selector, Utils.toFilePayloads(files), options);
+  }
+
   @Override
   public void setInputFiles(String selector, FilePayload[] files, SetInputFilesOptions options) {
     withLogging("Frame.setInputFiles", () -> setInputFilesImpl(selector, files, options));
   }
 
   void setInputFilesImpl(String selector, FilePayload[] files, SetInputFilesOptions options) {
-    checkFilePayloadSize(files);
     if (options == null) {
       options = new SetInputFilesOptions();
     }
@@ -885,17 +800,17 @@ public class FrameImpl extends ChannelOwner implements Frame {
 
   @Override
   public void waitForLoadState(LoadState state, WaitForLoadStateOptions options) {
-    withWaitLogging("Frame.waitForLoadState", logger -> {
-      waitForLoadStateImpl(state, options, logger);
+    withWaitLogging("Frame.waitForLoadState", () -> {
+      waitForLoadStateImpl(state, options);
       return null;
     });
   }
 
-  void waitForLoadStateImpl(LoadState state, WaitForLoadStateOptions options, Logger logger) {
-    waitForLoadStateImpl(convertType(state, WaitUntilState.class), options, logger);
+  void waitForLoadStateImpl(LoadState state, WaitForLoadStateOptions options) {
+    waitForLoadStateImpl(convertViaJson(state, WaitUntilState.class), options);
   }
 
-  private void waitForLoadStateImpl(WaitUntilState state, WaitForLoadStateOptions options, Logger logger) {
+  private void waitForLoadStateImpl(WaitUntilState state, WaitForLoadStateOptions options) {
     if (options == null) {
       options = new WaitForLoadStateOptions();
     }
@@ -904,7 +819,7 @@ public class FrameImpl extends ChannelOwner implements Frame {
     }
 
     List<Waitable<Void>> waitables = new ArrayList<>();
-    waitables.add(new WaitForLoadStateHelper(state, logger));
+    waitables.add(new WaitForLoadStateHelper(state));
     waitables.add(page.createWaitForCloseHelper());
     waitables.add(page.createWaitableTimeout(options.timeout));
     runUntil(() -> {}, new WaitableRace<>(waitables));
@@ -912,12 +827,10 @@ public class FrameImpl extends ChannelOwner implements Frame {
 
   private class WaitForLoadStateHelper implements Waitable<Void>, Consumer<WaitUntilState> {
     private final WaitUntilState expectedState;
-    private final Logger logger;
     private boolean isDone;
 
-    WaitForLoadStateHelper(WaitUntilState state, Logger logger) {
+    WaitForLoadStateHelper(WaitUntilState state) {
       expectedState = state;
-      this.logger = logger;
       isDone = loadStates.contains(state);
       if (!isDone) {
         internalListeners.add(InternalEventType.LOADSTATE, this);
@@ -926,7 +839,6 @@ public class FrameImpl extends ChannelOwner implements Frame {
 
     @Override
     public void accept(WaitUntilState state) {
-      logger.log("  load state changed to " + state);
       if (expectedState.equals(state)) {
         isDone = true;
         dispose();
@@ -950,24 +862,20 @@ public class FrameImpl extends ChannelOwner implements Frame {
   private class WaitForNavigationHelper implements Waitable<Response>, Consumer<JsonObject> {
     private final UrlMatcher matcher;
     private final WaitUntilState expectedLoadState;
-    private final Logger logger;
     private WaitForLoadStateHelper loadStateHelper;
 
     private RequestImpl request;
     private RuntimeException exception;
 
-    WaitForNavigationHelper(UrlMatcher matcher, WaitUntilState expectedLoadState, Logger logger) {
+    WaitForNavigationHelper(UrlMatcher matcher, WaitUntilState expectedLoadState) {
       this.matcher = matcher;
       this.expectedLoadState = expectedLoadState;
-      this.logger = logger;
       internalListeners.add(InternalEventType.NAVIGATED, this);
     }
 
     @Override
     public void accept(JsonObject params) {
-      String url = params.get("url").getAsString();
-      logger.log("  navigated to " + url);
-      if (!matcher.test(url)) {
+      if (!matcher.test(params.get("url").getAsString())) {
         return;
       }
       if (params.has("error")) {
@@ -979,7 +887,7 @@ public class FrameImpl extends ChannelOwner implements Frame {
             request = connection.getExistingObject(jsonReq.get("guid").getAsString());
           }
         }
-        loadStateHelper = new WaitForLoadStateHelper(expectedLoadState, logger);
+        loadStateHelper = new WaitForLoadStateHelper(expectedLoadState);
       }
       internalListeners.remove(InternalEventType.NAVIGATED, this);
     }
@@ -1018,14 +926,14 @@ public class FrameImpl extends ChannelOwner implements Frame {
 
   @Override
   public Response waitForNavigation(WaitForNavigationOptions options, Runnable code) {
-    return withWaitLogging("Frame.waitForNavigation", logger -> waitForNavigationImpl(logger, code, options, null));
+    return withLogging("Frame.waitForNavigation", () -> waitForNavigationImpl(code, options, null));
   }
 
-  Response waitForNavigationImpl(Logger logger, Runnable code, WaitForNavigationOptions options) {
-    return waitForNavigationImpl(logger, code, options, null);
+  Response waitForNavigationImpl(Runnable code, WaitForNavigationOptions options) {
+    return waitForNavigationImpl(code, options, null);
   }
 
-  private Response waitForNavigationImpl(Logger logger, Runnable code, WaitForNavigationOptions options, UrlMatcher matcher) {
+  private Response waitForNavigationImpl(Runnable code, WaitForNavigationOptions options, UrlMatcher matcher) {
     if (options == null) {
       options = new WaitForNavigationOptions();
     }
@@ -1037,8 +945,7 @@ public class FrameImpl extends ChannelOwner implements Frame {
     if (matcher == null) {
       matcher = UrlMatcher.forOneOf(page.context().baseUrl, options.url);
     }
-    logger.log("waiting for navigation " + matcher);
-    waitables.add(new WaitForNavigationHelper(matcher, options.waitUntil, logger));
+    waitables.add(new WaitForNavigationHelper(matcher, options.waitUntil));
     waitables.add(page.createWaitForCloseHelper());
     waitables.add(page.createWaitableFrameDetach(this));
     waitables.add(page.createWaitableNavigationTimeout(options.timeout));
@@ -1096,35 +1003,18 @@ public class FrameImpl extends ChannelOwner implements Frame {
   }
 
   private void waitForURL(UrlMatcher matcher, WaitForURLOptions options) {
-    withWaitLogging("Frame.waitForURL", logger -> {
-      waitForURLImpl(logger, matcher, options);
-      return null;
-    });
+    withLogging("Frame.waitForURL", () -> waitForURLImpl(matcher, options));
   }
 
-  void waitForURLImpl(Logger logger, UrlMatcher matcher, WaitForURLOptions options) {
-    logger.log("waiting for url " + matcher);
+  void waitForURLImpl(UrlMatcher matcher, WaitForURLOptions options) {
     if (options == null) {
       options = new WaitForURLOptions();
     }
     if (matcher.test(url())) {
-      waitForLoadStateImpl(options.waitUntil, convertType(options, WaitForLoadStateOptions.class), logger);
+      waitForLoadStateImpl(options.waitUntil, convertViaJson(options, WaitForLoadStateOptions.class));
       return;
     }
-    waitForNavigationImpl(logger, () -> {}, convertType(options, WaitForNavigationOptions.class), matcher);
-  }
-
-  int queryCount(String selector) {
-    JsonObject params = new JsonObject();
-    params.addProperty("selector", selector);
-    JsonObject result = sendMessage("queryCount", params).getAsJsonObject();
-    return result.get("value").getAsInt();
-  }
-
-  void highlightImpl(String selector) {
-    JsonObject params = new JsonObject();
-    params.addProperty("selector", selector);
-    sendMessage("highlight", params);
+    waitForNavigationImpl(() -> {}, convertViaJson(options, WaitForNavigationOptions.class), matcher);
   }
 
   protected void handleEvent(String event, JsonObject params) {
@@ -1133,13 +1023,6 @@ public class FrameImpl extends ChannelOwner implements Frame {
       if (add != null) {
         WaitUntilState state = loadStateFromProtocol(add.getAsString());
         loadStates.add(state);
-        if (parentFrame == null && page != null) {
-          if (state == LOAD) {
-            page.listeners.notify(PageImpl.EventType.LOAD, page);
-          } else if (state == DOMCONTENTLOADED) {
-            page.listeners.notify(PageImpl.EventType.DOMCONTENTLOADED, page);
-          }
-        }
         internalListeners.notify(InternalEventType.LOADSTATE, state);
       }
       JsonElement remove = params.get("remove");

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

@@ -17,14 +17,6 @@
 package com.microsoft.playwright.impl;
 
 import com.microsoft.playwright.FrameLocator;
-import com.microsoft.playwright.Locator;
-import com.microsoft.playwright.PlaywrightException;
-import com.microsoft.playwright.options.AriaRole;
-
-import java.util.regex.Pattern;
-
-import static com.microsoft.playwright.impl.LocatorUtils.*;
-import static com.microsoft.playwright.impl.Utils.convertType;
 
 class FrameLocatorImpl implements FrameLocator {
   private final FrameImpl frame;
@@ -42,72 +34,7 @@ class FrameLocatorImpl implements FrameLocator {
 
   @Override
   public FrameLocatorImpl frameLocator(String selector) {
-    return new FrameLocatorImpl(frame, frameSelector + " >> internal:control=enter-frame >> " + selector);
-  }
-
-  @Override
-  public Locator getByAltText(String text, GetByAltTextOptions options) {
-    return locator(getByAltTextSelector(text, convertType(options, Locator.GetByAltTextOptions.class)));
-  }
-
-  @Override
-  public Locator getByAltText(Pattern text, GetByAltTextOptions options) {
-    return locator(getByAltTextSelector(text, convertType(options, Locator.GetByAltTextOptions.class)));
-  }
-
-  @Override
-  public Locator getByLabel(String text, GetByLabelOptions options) {
-    return locator(getByLabelSelector(text, convertType(options, Locator.GetByLabelOptions.class)));
-  }
-
-  @Override
-  public Locator getByLabel(Pattern text, GetByLabelOptions options) {
-    return locator(getByLabelSelector(text, convertType(options, Locator.GetByLabelOptions.class)));
-  }
-
-  @Override
-  public Locator getByPlaceholder(String text, GetByPlaceholderOptions options) {
-    return locator(getByPlaceholderSelector(text, convertType(options, Locator.GetByPlaceholderOptions.class)));
-  }
-
-  @Override
-  public Locator getByPlaceholder(Pattern text, GetByPlaceholderOptions options) {
-    return locator(getByPlaceholderSelector(text, convertType(options, Locator.GetByPlaceholderOptions.class)));
-  }
-
-  @Override
-  public Locator getByRole(AriaRole role, GetByRoleOptions options) {
-    return locator(getByRoleSelector(role, convertType(options, Locator.GetByRoleOptions.class)));
-  }
-
-  @Override
-  public Locator getByTestId(String testId) {
-    return locator(getByTestIdSelector(testId));
-  }
-
-  @Override
-  public Locator getByTestId(Pattern testId) {
-    return locator(getByTestIdSelector(testId));
-  }
-
-  @Override
-  public Locator getByText(String text, GetByTextOptions options) {
-    return locator(getByTextSelector(text, convertType(options, Locator.GetByTextOptions.class)));
-  }
-
-  @Override
-  public Locator getByText(Pattern text, GetByTextOptions options) {
-    return locator(getByTextSelector(text, convertType(options, Locator.GetByTextOptions.class)));
-  }
-
-  @Override
-  public Locator getByTitle(String text, GetByTitleOptions options) {
-    return locator(getByTitleSelector(text, convertType(options, Locator.GetByTitleOptions.class)));
-  }
-
-  @Override
-  public Locator getByTitle(Pattern text, GetByTitleOptions options) {
-    return locator(getByTitleSelector(text, convertType(options, Locator.GetByTitleOptions.class)));
+    return new FrameLocatorImpl(frame, frameSelector + " >> control=enter-frame >> " + selector);
   }
 
   @Override
@@ -116,17 +43,8 @@ class FrameLocatorImpl implements FrameLocator {
   }
 
   @Override
-  public Locator locator(String selector, LocatorOptions options) {
-    return new LocatorImpl(frame, frameSelector + " >> internal:control=enter-frame >> " + selector, convertType(options, Locator.LocatorOptions.class));
-  }
-
-  @Override
-  public Locator locator(Locator selectorOrLocator, LocatorOptions options) {
-    LocatorImpl other = (LocatorImpl) selectorOrLocator;
-    if (other.frame != frame) {
-      throw new PlaywrightException("Locators must belong to the same frame.");
-    }
-    return locator(other.selector, options);
+  public LocatorImpl locator(String selector) {
+    return new LocatorImpl(frame, frameSelector + " >> control=enter-frame >> " + selector);
   }
 
   @Override

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

@@ -1,104 +0,0 @@
-/*
- * Copyright (c) Microsoft Corporation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.microsoft.playwright.impl;
-
-import com.google.gson.JsonObject;
-import com.microsoft.playwright.PlaywrightException;
-import com.microsoft.playwright.Request;
-import com.microsoft.playwright.Route;
-import com.microsoft.playwright.options.HarNotFound;
-
-import java.nio.file.Path;
-import java.util.Base64;
-import java.util.Map;
-
-import static com.microsoft.playwright.impl.LoggingSupport.*;
-import static com.microsoft.playwright.impl.Serialization.fromNameValues;
-import static com.microsoft.playwright.impl.Serialization.gson;
-
-public class HARRouter {
-  private final LocalUtils localUtils;
-  private final HarNotFound defaultAction;
-  private final String harId;
-
-  HARRouter(LocalUtils localUtils, Path harFile, HarNotFound defaultAction) {
-    this.localUtils = localUtils;
-    this.defaultAction = defaultAction;
-
-    JsonObject params = new JsonObject();
-    params.addProperty("file", harFile.toString());
-    JsonObject json = localUtils.sendMessage("harOpen", params).getAsJsonObject();
-    if (json.has("error")) {
-      throw new PlaywrightException(json.get("error").getAsString());
-    }
-    harId = json.get("harId").getAsString();
-  }
-
-  void handle(Route route) {
-    Request request = route.request();
-
-    JsonObject params = new JsonObject();
-    params.addProperty("harId", harId);
-    params.addProperty("url", request.url());
-    params.addProperty("method", request.method());
-    params.add("headers", gson().toJsonTree(request.headersArray()));
-    if (request.postDataBuffer() != null) {
-      String base64 = Base64.getEncoder().encodeToString(request.postDataBuffer());
-      params.addProperty("postData", base64);
-    }
-    params.addProperty("isNavigationRequest", request.isNavigationRequest());
-    JsonObject response = localUtils.sendMessage("harLookup", params).getAsJsonObject();
-
-    String action = response.get("action").getAsString();
-    if ("redirect".equals(action)) {
-      String redirectURL = response.get("redirectURL").getAsString();
-      logApiIfEnabled("HAR: " + route.request().url() + " redirected to " + redirectURL);
-      ((RouteImpl) route).redirectNavigationRequest(redirectURL);
-      return;
-    }
-
-    if ("fulfill".equals(action)) {
-      int status = response.get("status").getAsInt();
-      Map<String, String> headers = fromNameValues(response.getAsJsonArray("headers"));
-      byte[] buffer = Base64.getDecoder().decode(response.get("body").getAsString());
-      route.fulfill(new Route.FulfillOptions()
-        .setStatus(status)
-        .setHeaders(headers)
-        .setBodyBytes(buffer));
-      return;
-    }
-
-    if ("error".equals(action)) {
-      logApiIfEnabled("HAR: " + response.get("message").getAsString());
-      // Report the error, but fall through to the default handler.
-    }
-
-    if (defaultAction == HarNotFound.FALLBACK) {
-      route.fallback();
-      return;
-    }
-
-    // By default abort not matching requests.
-    route.abort();
-  }
-
-  void dispose() {
-    JsonObject params = new JsonObject();
-    params.addProperty("harId", harId);
-    localUtils.sendMessageAsync("harClose", params);
-  }
-}

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

@@ -16,23 +16,14 @@
 
 package com.microsoft.playwright.impl;
 
-import com.google.gson.JsonObject;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
 import java.util.function.Consumer;
 
 class ListenerCollection <EventType> {
   private final HashMap<EventType, List<Consumer<?>>> listeners = new HashMap<>();
-  private final Map<EventType, String> eventSubscriptions;
-  private final ChannelOwner channelOwner;
-
-  ListenerCollection() {
-    this(null, null);
-  }
-  ListenerCollection(Map<EventType, String> eventSubscriptions, ChannelOwner channelOwner) {
-    this.eventSubscriptions = eventSubscriptions;
-    this.channelOwner = channelOwner;
-  }
 
   <T> void notify(EventType eventType, T param) {
     List<Consumer<?>> list = listeners.get(eventType);
@@ -50,7 +41,6 @@ class ListenerCollection <EventType> {
     if (list == null) {
       list = new ArrayList<>();
       listeners.put(type, list);
-      updateSubscription(type, true);
     }
     list.add(listener);
   }
@@ -62,7 +52,6 @@ class ListenerCollection <EventType> {
     }
     list.removeAll(Collections.singleton(listener));
     if (list.isEmpty()) {
-      updateSubscription(type, false);
       listeners.remove(type);
     }
   }
@@ -70,18 +59,4 @@ class ListenerCollection <EventType> {
   boolean hasListeners(EventType type) {
     return listeners.containsKey(type);
   }
-
-  private void updateSubscription(EventType eventType, boolean enabled) {
-    if (eventSubscriptions == null) {
-      return;
-    }
-    String protocolEvent = eventSubscriptions.get(eventType);
-    if (protocolEvent == null) {
-      return;
-    }
-    JsonObject params = new JsonObject();
-    params.addProperty("event", protocolEvent);
-    params.addProperty("enabled", enabled);
-    channelOwner.sendMessageAsync("updateSubscription", params);
-  }
 }

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

@@ -1,57 +0,0 @@
-/*
- * Copyright (c) Microsoft Corporation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.microsoft.playwright.impl;
-
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
-
-import java.nio.file.Path;
-import java.util.List;
-
-import static com.microsoft.playwright.impl.Serialization.gson;
-
-class LocalUtils extends ChannelOwner {
-  LocalUtils(ChannelOwner parent, String type, String guid, JsonObject initializer) {
-    super(parent, type, guid, initializer);
-  }
-
-  void zip(Path zipFile, JsonArray entries, String stacksId, boolean appendMode, boolean includeSources) {
-    JsonObject params = new JsonObject();
-    params.addProperty("zipFile", zipFile.toString());
-    params.add("entries", entries);
-    params.addProperty("mode", appendMode ? "append" : "write");
-    params.addProperty("stacksId", stacksId);
-    params.addProperty("includeSources", includeSources);
-    sendMessage("zip", params);
-  }
-
-  void traceDiscarded(String stacksId) {
-    JsonObject params = new JsonObject();
-    params.addProperty("stacksId", stacksId);
-    sendMessage("traceDiscarded", params);
-  }
-
-  String tracingStarted(String tracesDir, String traceName) {
-    JsonObject params = new JsonObject();
-    if (tracesDir != null) {
-      params.addProperty("tracesDir", "");
-    }
-    params.addProperty("traceName", traceName);
-    JsonObject json = connection.localUtils().sendMessage("tracingStarted", params).getAsJsonObject();
-    return json.get("stacksId").getAsString();
-  }
-}

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

@@ -3,57 +3,30 @@ package com.microsoft.playwright.impl;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.microsoft.playwright.*;
-import com.microsoft.playwright.options.*;
+import com.microsoft.playwright.options.BoundingBox;
+import com.microsoft.playwright.options.FilePayload;
+import com.microsoft.playwright.options.SelectOption;
+import com.microsoft.playwright.options.WaitForSelectorState;
 
-import java.lang.reflect.Field;
 import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.function.BiFunction;
-import java.util.regex.Pattern;
 
-import static com.microsoft.playwright.impl.LocatorUtils.*;
 import static com.microsoft.playwright.impl.Serialization.gson;
-import static com.microsoft.playwright.impl.Utils.convertType;
-import static com.microsoft.playwright.impl.Utils.toJsRegexFlags;
+import static com.microsoft.playwright.impl.Serialization.serializeArgument;
+import static com.microsoft.playwright.impl.Utils.convertViaJson;
 
 class LocatorImpl implements Locator {
-  final FrameImpl frame;
-  final String selector;
+  private final FrameImpl frame;
+  private final String selector;
 
-  public LocatorImpl(FrameImpl frame, String selector, LocatorOptions options) {
+  public LocatorImpl(FrameImpl frame, String selector) {
     this.frame = frame;
-    if (options != null) {
-      if (options.hasText != null) {
-        selector += " >> internal:has-text=" + escapeForTextSelector(options.hasText, false);
-      }
-      if (options.hasNotText != null) {
-        selector += " >> internal:has-not-text=" + escapeForTextSelector(options.hasNotText, false);
-      }
-      if (options.has != null) {
-        LocatorImpl locator = (LocatorImpl) options.has;
-        if (locator.frame != frame)
-          throw new Error("Inner 'has' locator must belong to the same frame.");
-        selector += " >> internal:has=" + gson().toJson(locator.selector);
-      }
-      if (options.hasNot != null) {
-        LocatorImpl locator = (LocatorImpl) options.hasNot;
-        if (locator.frame != frame)
-          throw new Error("Inner 'hasNot' locator must belong to the same frame.");
-        selector += " >> internal:has-not=" + gson().toJson(locator.selector);
-      }
-    }
     this.selector = selector;
   }
 
-  private static String escapeWithQuotes(String text) {
-    return gson().toJson(text);
-  }
-
   private <R, O> R withElement(BiFunction<ElementHandle, O, R> callback, O options) {
-    ElementHandleOptions handleOptions = convertType(options, ElementHandleOptions.class);
+    ElementHandleOptions handleOptions = convertViaJson(options, ElementHandleOptions.class);
     // TODO: support deadline based timeout
 //    Double timeout = null;
 //    if (handleOptions != null) {
@@ -71,16 +44,6 @@ class LocatorImpl implements Locator {
     }
   }
 
-  @Override
-  public List<Locator> all() {
-    List<Locator> result = new ArrayList<>();
-    int count = this.count();
-    for (int i = 0; i < count; i++) {
-      result.add(nth(i));
-    }
-    return result;
-  }
-
   @Override
   public List<String> allInnerTexts() {
     return (List<String>) frame.evalOnSelectorAll(selector, "ee => ee.map(e => e.innerText)");
@@ -91,29 +54,6 @@ class LocatorImpl implements Locator {
     return (List<String>) frame.evalOnSelectorAll(selector, "ee => ee.map(e => e.textContent || '')");
   }
 
-  @Override
-  public Locator and(Locator locator) {
-    LocatorImpl other = (LocatorImpl) locator;
-    if (other.frame != frame)
-      throw new Error("Locators must belong to the same frame.");
-    return new LocatorImpl(frame, selector + " >> internal:and=" + gson().toJson(other.selector), null);
-  }
-
-  @Override
-  public void blur(BlurOptions options) {
-    frame.withLogging("Locator.blur", () -> blurImpl(options));
-  }
-
-  private void blurImpl(BlurOptions options) {
-    if (options == null) {
-      options = new BlurOptions();
-    }
-    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
-    params.addProperty("selector", selector);
-    params.addProperty("strict", true);
-    frame.sendMessage("blur", params);
-  }
-
   @Override
   public BoundingBox boundingBox(BoundingBoxOptions options) {
     return withElement((h, o) -> h.boundingBox(), options);
@@ -124,12 +64,7 @@ class LocatorImpl implements Locator {
     if (options == null) {
       options = new CheckOptions();
     }
-    frame.check(selector, convertType(options, Frame.CheckOptions.class).setStrict(true));
-  }
-
-  @Override
-  public void clear(ClearOptions options) {
-    fill("", convertType(options, FillOptions.class));
+    frame.check(selector, convertViaJson(options, Frame.CheckOptions.class).setStrict(true));
   }
 
   @Override
@@ -137,12 +72,12 @@ class LocatorImpl implements Locator {
     if (options == null) {
       options = new ClickOptions();
     }
-    frame.click(selector, convertType(options, Frame.ClickOptions.class).setStrict(true));
+    frame.click(selector, convertViaJson(options, Frame.ClickOptions.class).setStrict(true));
   }
 
   @Override
   public int count() {
-    return frame.queryCount(selector);
+    return ((Number) evaluateAll("ee => ee.length")).intValue();
   }
 
   @Override
@@ -150,7 +85,7 @@ class LocatorImpl implements Locator {
     if (options == null) {
       options = new DblclickOptions();
     }
-    frame.dblclick(selector, convertType(options, Frame.DblclickOptions.class).setStrict(true));
+    frame.dblclick(selector, convertViaJson(options, Frame.DblclickOptions.class).setStrict(true));
   }
 
   @Override
@@ -158,17 +93,7 @@ class LocatorImpl implements Locator {
     if (options == null) {
       options = new DispatchEventOptions();
     }
-    frame.dispatchEvent(selector, type, eventInit, convertType(options, Frame.DispatchEventOptions.class).setStrict(true));
-  }
-
-  @Override
-  public void dragTo(Locator target, DragToOptions options) {
-    if (options == null) {
-      options = new DragToOptions();
-    }
-    Frame.DragAndDropOptions frameOptions = convertType(options, Frame.DragAndDropOptions.class);
-    frameOptions.setStrict(true);
-    frame.dragAndDrop(selector, ((LocatorImpl) target).selector, frameOptions);
+    frame.dispatchEvent(selector, type, eventInit, convertViaJson(options, Frame.DispatchEventOptions.class).setStrict(true));
   }
 
   @Override
@@ -176,7 +101,7 @@ class LocatorImpl implements Locator {
     if (options == null) {
       options = new ElementHandleOptions();
     }
-    Frame.WaitForSelectorOptions frameOptions = convertType(options, Frame.WaitForSelectorOptions.class);
+    Frame.WaitForSelectorOptions frameOptions = convertViaJson(options, Frame.WaitForSelectorOptions.class);
     frameOptions.setStrict(true);
     frameOptions.setState(WaitForSelectorState.ATTACHED);
     return frame.waitForSelector(selector, frameOptions);
@@ -207,17 +132,12 @@ class LocatorImpl implements Locator {
     if (options == null) {
       options = new FillOptions();
     }
-    frame.fill(selector, value, convertType(options, Frame.FillOptions.class).setStrict(true));
-  }
-
-  @Override
-  public Locator filter(FilterOptions options) {
-    return new LocatorImpl(frame, selector, convertType(options,LocatorOptions.class));
+    frame.fill(selector, value, convertViaJson(options, Frame.FillOptions.class).setStrict(true));
   }
 
   @Override
   public Locator first() {
-    return new LocatorImpl(frame, selector + " >> nth=0", null);
+    return new LocatorImpl(frame, selector + " >> nth=0");
   }
 
   @Override
@@ -225,7 +145,7 @@ class LocatorImpl implements Locator {
     if (options == null) {
       options = new FocusOptions();
     }
-    frame.focus(selector, convertType(options, Frame.FocusOptions.class).setStrict(true));
+    frame.focus(selector, convertViaJson(options, Frame.FocusOptions.class).setStrict(true));
   }
 
   @Override
@@ -238,77 +158,7 @@ class LocatorImpl implements Locator {
     if (options == null) {
       options = new GetAttributeOptions();
     }
-    return frame.getAttribute(selector, name, convertType(options, Frame.GetAttributeOptions.class).setStrict(true));
-  }
-
-  @Override
-  public Locator getByAltText(String text, GetByAltTextOptions options) {
-    return locator(getByAltTextSelector(text, options));
-  }
-
-  @Override
-  public Locator getByAltText(Pattern text, GetByAltTextOptions options) {
-    return locator(getByAltTextSelector(text, options));
-  }
-
-  @Override
-  public Locator getByLabel(String text, GetByLabelOptions options) {
-    return locator(getByLabelSelector(text, options));
-  }
-
-  @Override
-  public Locator getByLabel(Pattern text, GetByLabelOptions options) {
-    return locator(getByLabelSelector(text, options));
-  }
-
-  @Override
-  public Locator getByPlaceholder(String text, GetByPlaceholderOptions options) {
-    return locator(getByPlaceholderSelector(text, options));
-  }
-
-  @Override
-  public Locator getByPlaceholder(Pattern text, GetByPlaceholderOptions options) {
-    return locator(getByPlaceholderSelector(text, options));
-  }
-
-  @Override
-  public Locator getByRole(AriaRole role, GetByRoleOptions options) {
-    return locator(getByRoleSelector(role, options));
-  }
-
-  @Override
-  public Locator getByTestId(String testId) {
-    return locator(getByTestIdSelector(testId));
-  }
-
-  @Override
-  public Locator getByTestId(Pattern testId) {
-    return locator(getByTestIdSelector(testId));
-  }
-
-  @Override
-  public Locator getByText(String text, GetByTextOptions options) {
-    return locator(getByTextSelector(text, options));
-  }
-
-  @Override
-  public Locator getByText(Pattern text, GetByTextOptions options) {
-    return locator(getByTextSelector(text, options));
-  }
-
-  @Override
-  public Locator getByTitle(String text, GetByTitleOptions options) {
-    return locator(getByTitleSelector(text, options));
-  }
-
-  @Override
-  public Locator getByTitle(Pattern text, GetByTitleOptions options) {
-    return locator(getByTitleSelector(text, options));
-  }
-
-  @Override
-  public void highlight() {
-    frame.highlightImpl(selector);
+    return frame.getAttribute(selector, name, convertViaJson(options, Frame.GetAttributeOptions.class).setStrict(true));
   }
 
   @Override
@@ -316,7 +166,7 @@ class LocatorImpl implements Locator {
     if (options == null) {
       options = new HoverOptions();
     }
-    frame.hover(selector, convertType(options, Frame.HoverOptions.class).setStrict(true));
+    frame.hover(selector, convertViaJson(options, Frame.HoverOptions.class).setStrict(true));
   }
 
   @Override
@@ -324,7 +174,7 @@ class LocatorImpl implements Locator {
     if (options == null) {
       options = new InnerHTMLOptions();
     }
-    return frame.innerHTML(selector, convertType(options, Frame.InnerHTMLOptions.class).setStrict(true));
+    return frame.innerHTML(selector, convertViaJson(options, Frame.InnerHTMLOptions.class).setStrict(true));
   }
 
   @Override
@@ -332,7 +182,7 @@ class LocatorImpl implements Locator {
     if (options == null) {
       options = new InnerTextOptions();
     }
-    return frame.innerText(selector, convertType(options, Frame.InnerTextOptions.class).setStrict(true));
+    return frame.innerText(selector, convertViaJson(options, Frame.InnerTextOptions.class).setStrict(true));
   }
 
   @Override
@@ -340,7 +190,7 @@ class LocatorImpl implements Locator {
     if (options == null) {
       options = new InputValueOptions();
     }
-    return frame.inputValue(selector, convertType(options, Frame.InputValueOptions.class).setStrict(true));
+    return frame.inputValue(selector, convertViaJson(options, Frame.InputValueOptions.class).setStrict(true));
   }
 
   @Override
@@ -348,7 +198,7 @@ class LocatorImpl implements Locator {
     if (options == null) {
       options = new IsCheckedOptions();
     }
-    return frame.isChecked(selector, convertType(options, Frame.IsCheckedOptions.class).setStrict(true));
+    return frame.isChecked(selector, convertViaJson(options, Frame.IsCheckedOptions.class).setStrict(true));
   }
 
   @Override
@@ -356,7 +206,7 @@ class LocatorImpl implements Locator {
     if (options == null) {
       options = new IsDisabledOptions();
     }
-    return frame.isDisabled(selector, convertType(options, Frame.IsDisabledOptions.class).setStrict(true));
+    return frame.isDisabled(selector, convertViaJson(options, Frame.IsDisabledOptions.class).setStrict(true));
   }
 
   @Override
@@ -364,7 +214,7 @@ class LocatorImpl implements Locator {
     if (options == null) {
       options = new IsEditableOptions();
     }
-    return frame.isEditable(selector, convertType(options, Frame.IsEditableOptions.class).setStrict(true));
+    return frame.isEditable(selector, convertViaJson(options, Frame.IsEditableOptions.class).setStrict(true));
   }
 
   @Override
@@ -372,7 +222,7 @@ class LocatorImpl implements Locator {
     if (options == null) {
       options = new IsEnabledOptions();
     }
-    return frame.isEnabled(selector, convertType(options, Frame.IsEnabledOptions.class).setStrict(true));
+    return frame.isEnabled(selector, convertViaJson(options, Frame.IsEnabledOptions.class).setStrict(true));
   }
 
   @Override
@@ -380,7 +230,7 @@ class LocatorImpl implements Locator {
     if (options == null) {
       options = new IsHiddenOptions();
     }
-    return frame.isHidden(selector, convertType(options, Frame.IsHiddenOptions.class).setStrict(true));
+    return frame.isHidden(selector, convertViaJson(options, Frame.IsHiddenOptions.class).setStrict(true));
   }
 
   @Override
@@ -388,44 +238,22 @@ class LocatorImpl implements Locator {
     if (options == null) {
       options = new IsVisibleOptions();
     }
-    return frame.isVisible(selector, convertType(options, Frame.IsVisibleOptions.class).setStrict(true));
+    return frame.isVisible(selector, convertViaJson(options, Frame.IsVisibleOptions.class).setStrict(true));
   }
 
   @Override
   public Locator last() {
-    return new LocatorImpl(frame, selector + " >> nth=-1", null);
+    return new LocatorImpl(frame, selector + " >> nth=-1");
   }
 
   @Override
-  public Locator locator(String selector, LocatorOptions options) {
-    return new LocatorImpl(frame, this.selector + " >> " + selector, options);
-  }
-
-  @Override
-  public Locator locator(Locator selectorOrLocator, LocatorOptions options) {
-    LocatorImpl other = (LocatorImpl) selectorOrLocator;
-    if (other.frame != frame) {
-      throw new PlaywrightException("Locators must belong to the same frame.");
-    }
-    return locator(other.selector, options);
+  public Locator locator(String selector) {
+    return new LocatorImpl(frame, this.selector + " >> " + selector);
   }
 
   @Override
   public Locator nth(int index) {
-    return new LocatorImpl(frame, selector + " >> nth=" + index, null);
-  }
-
-  @Override
-  public Locator or(Locator locator) {
-    LocatorImpl other = (LocatorImpl) locator;
-    if (other.frame != frame)
-      throw new Error("Locators must belong to the same frame.");
-    return new LocatorImpl(frame, selector + " >> internal:or=" + gson().toJson(other.selector), null);
-  }
-
-  @Override
-  public Page page() {
-    return frame.page();
+    return new LocatorImpl(frame, selector + " >> nth=" + index);
   }
 
   @Override
@@ -433,12 +261,12 @@ class LocatorImpl implements Locator {
     if (options == null) {
       options = new PressOptions();
     }
-    frame.press(selector, key, convertType(options, Frame.PressOptions.class).setStrict(true));
+    frame.press(selector, key, convertViaJson(options, Frame.PressOptions.class).setStrict(true));
   }
 
   @Override
   public byte[] screenshot(ScreenshotOptions options) {
-    return withElement((h, o) -> h.screenshot(o), convertType(options, ElementHandle.ScreenshotOptions.class));
+    return withElement((h, o) -> h.screenshot(o), convertViaJson(options, ElementHandle.ScreenshotOptions.class));
   }
 
   @Override
@@ -446,7 +274,7 @@ class LocatorImpl implements Locator {
     withElement((h, o) -> {
       h.scrollIntoViewIfNeeded(o);
       return null;
-    }, convertType(options, ElementHandle.ScrollIntoViewIfNeededOptions.class));
+    }, convertViaJson(options, ElementHandle.ScrollIntoViewIfNeededOptions.class));
   }
 
   @Override
@@ -454,7 +282,7 @@ class LocatorImpl implements Locator {
     if (options == null) {
       options = new SelectOptionOptions();
     }
-    return frame.selectOption(selector, values, convertType(options, Frame.SelectOptionOptions.class).setStrict(true));
+    return frame.selectOption(selector, values, convertViaJson(options, Frame.SelectOptionOptions.class).setStrict(true));
   }
 
   @Override
@@ -462,7 +290,7 @@ class LocatorImpl implements Locator {
     if (options == null) {
       options = new SelectOptionOptions();
     }
-    return frame.selectOption(selector, values, convertType(options, Frame.SelectOptionOptions.class).setStrict(true));
+    return frame.selectOption(selector, values, convertViaJson(options, Frame.SelectOptionOptions.class).setStrict(true));
   }
 
   @Override
@@ -470,7 +298,7 @@ class LocatorImpl implements Locator {
     if (options == null) {
       options = new SelectOptionOptions();
     }
-    return frame.selectOption(selector, values, convertType(options, Frame.SelectOptionOptions.class).setStrict(true));
+    return frame.selectOption(selector, values, convertViaJson(options, Frame.SelectOptionOptions.class).setStrict(true));
   }
 
   @Override
@@ -478,7 +306,7 @@ class LocatorImpl implements Locator {
     if (options == null) {
       options = new SelectOptionOptions();
     }
-    return frame.selectOption(selector, values, convertType(options, Frame.SelectOptionOptions.class).setStrict(true));
+    return frame.selectOption(selector, values, convertViaJson(options, Frame.SelectOptionOptions.class).setStrict(true));
   }
 
   @Override
@@ -486,7 +314,7 @@ class LocatorImpl implements Locator {
     if (options == null) {
       options = new SelectOptionOptions();
     }
-    return frame.selectOption(selector, values, convertType(options, Frame.SelectOptionOptions.class).setStrict(true));
+    return frame.selectOption(selector, values, convertViaJson(options, Frame.SelectOptionOptions.class).setStrict(true));
   }
 
   @Override
@@ -494,7 +322,7 @@ class LocatorImpl implements Locator {
     if (options == null) {
       options = new SelectOptionOptions();
     }
-    return frame.selectOption(selector, values, convertType(options, Frame.SelectOptionOptions.class).setStrict(true));
+    return frame.selectOption(selector, values, convertViaJson(options, Frame.SelectOptionOptions.class).setStrict(true));
   }
 
   @Override
@@ -502,7 +330,7 @@ class LocatorImpl implements Locator {
     withElement((h, o) -> {
       h.selectText(o);
       return null;
-    }, convertType(options, ElementHandle.SelectTextOptions.class));
+    }, convertViaJson(options, ElementHandle.SelectTextOptions.class));
   }
 
   @Override
@@ -510,7 +338,7 @@ class LocatorImpl implements Locator {
     if (options == null) {
       options = new SetCheckedOptions();
     }
-    frame.setChecked(selector, checked, convertType(options, Frame.SetCheckedOptions.class).setStrict(true));
+    frame.setChecked(selector, checked, convertViaJson(options, Frame.SetCheckedOptions.class).setStrict(true));
   }
 
   @Override
@@ -518,7 +346,7 @@ class LocatorImpl implements Locator {
     if (options == null) {
       options = new SetInputFilesOptions();
     }
-    frame.setInputFiles(selector, files, convertType(options, Frame.SetInputFilesOptions.class).setStrict(true));
+    frame.setInputFiles(selector, files, convertViaJson(options, Frame.SetInputFilesOptions.class).setStrict(true));
   }
 
   @Override
@@ -526,7 +354,7 @@ class LocatorImpl implements Locator {
     if (options == null) {
       options = new SetInputFilesOptions();
     }
-    frame.setInputFiles(selector, files, convertType(options, Frame.SetInputFilesOptions.class).setStrict(true));
+    frame.setInputFiles(selector, files, convertViaJson(options, Frame.SetInputFilesOptions.class).setStrict(true));
   }
 
   @Override
@@ -534,7 +362,7 @@ class LocatorImpl implements Locator {
     if (options == null) {
       options = new SetInputFilesOptions();
     }
-    frame.setInputFiles(selector, files, convertType(options, Frame.SetInputFilesOptions.class).setStrict(true));
+    frame.setInputFiles(selector, files, convertViaJson(options, Frame.SetInputFilesOptions.class).setStrict(true));
   }
 
   @Override
@@ -542,7 +370,7 @@ class LocatorImpl implements Locator {
     if (options == null) {
       options = new SetInputFilesOptions();
     }
-    frame.setInputFiles(selector, files, convertType(options, Frame.SetInputFilesOptions.class).setStrict(true));
+    frame.setInputFiles(selector, files, convertViaJson(options, Frame.SetInputFilesOptions.class).setStrict(true));
   }
 
   @Override
@@ -550,7 +378,7 @@ class LocatorImpl implements Locator {
     if (options == null) {
       options = new TapOptions();
     }
-    frame.tap(selector, convertType(options, Frame.TapOptions.class).setStrict(true));
+    frame.tap(selector, convertViaJson(options, Frame.TapOptions.class).setStrict(true));
   }
 
   @Override
@@ -558,7 +386,7 @@ class LocatorImpl implements Locator {
     if (options == null) {
       options = new TextContentOptions();
     }
-    return frame.textContent(selector, convertType(options, Frame.TextContentOptions.class).setStrict(true));
+    return frame.textContent(selector, convertViaJson(options, Frame.TextContentOptions.class).setStrict(true));
   }
 
   @Override
@@ -566,7 +394,7 @@ class LocatorImpl implements Locator {
     if (options == null) {
       options = new TypeOptions();
     }
-    frame.type(selector, text, convertType(options, Frame.TypeOptions.class).setStrict(true));
+    frame.type(selector, text, convertViaJson(options, Frame.TypeOptions.class).setStrict(true));
   }
 
   @Override
@@ -574,7 +402,7 @@ class LocatorImpl implements Locator {
     if (options == null) {
       options = new UncheckOptions();
     }
-    frame.uncheck(selector, convertType(options, Frame.UncheckOptions.class).setStrict(true));
+    frame.uncheck(selector, convertViaJson(options, Frame.UncheckOptions.class).setStrict(true));
   }
 
   @Override
@@ -586,7 +414,7 @@ class LocatorImpl implements Locator {
   }
 
   private void waitForImpl(WaitForOptions options) {
-    frame.withLogging("Locator.waitFor", () -> frame.waitForSelectorImpl(selector, convertType(options, Frame.WaitForSelectorOptions.class).setStrict(true), true));
+    frame.withLogging("Locator.waitFor", () -> frame.waitForSelectorImpl(selector, convertViaJson(options, Frame.WaitForSelectorOptions.class).setStrict(true), true));
   }
 
   @Override
@@ -598,13 +426,6 @@ class LocatorImpl implements Locator {
     return frame.withLogging("Locator.expect", () -> expectImpl(expression, options));
   }
 
-  JsonObject toProtocol() {
-    JsonObject result = new JsonObject();
-    result.add("frame", frame.toProtocolRef());
-    result.addProperty("selector", selector);
-    return result;
-  }
-
   private FrameExpectResult expectImpl(String expression, FrameExpectOptions options) {
     if (options == null) {
       options = new FrameExpectOptions();

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

@@ -1,127 +0,0 @@
-package com.microsoft.playwright.impl;
-
-import com.microsoft.playwright.Locator;
-import com.microsoft.playwright.options.AriaRole;
-
-import java.util.regex.Pattern;
-
-import static com.microsoft.playwright.impl.Utils.toJsRegexFlags;
-
-public class LocatorUtils {
-  private static volatile String testIdAttributeName = "data-testid";;
-
-  static void setTestIdAttributeName(String name) {
-    testIdAttributeName = name;
-  }
-
-  static String getByTextSelector(Object text, Locator.GetByTextOptions options) {
-    boolean exact = options != null && options.exact != null && options.exact;
-    return "internal:text=" + escapeForTextSelector(text, exact);
-  }
-
-  static String getByLabelSelector(Object text, Locator.GetByLabelOptions options) {
-    boolean exact = options != null && options.exact != null && options.exact;
-    return "internal:label=" + escapeForTextSelector(text, exact);
-  }
-
-  private static String getByAttributeTextSelector(String attrName, Object value, boolean exact) {
-    if (value instanceof Pattern) {
-      return "internal:attr=[" + attrName + "=" + toJsRegExp((Pattern) value) + "]";
-    }
-    return "internal:attr=[" + attrName + "=" + escapeForAttributeSelector((String) value, exact) + "]";
-  }
-
-  static String getByTestIdSelector(Object testId) {
-    return getByAttributeTextSelector(testIdAttributeName, testId, true);
-  }
-
-  static String getByAltTextSelector(Object text, Locator.GetByAltTextOptions options) {
-    boolean exact = options != null && options.exact != null && options.exact;
-    return getByAttributeTextSelector("alt", text, exact);
-  }
-
-  static String getByTitleSelector(Object text, Locator.GetByTitleOptions options) {
-    boolean exact = options != null && options.exact != null && options.exact;
-    return getByAttributeTextSelector("title", text, exact);
-  }
-
-  static String getByPlaceholderSelector(Object text, Locator.GetByPlaceholderOptions options) {
-    boolean exact = options != null && options.exact != null && options.exact;
-    return getByAttributeTextSelector("placeholder", text, exact);
-  }
-
-  private static void addAttr(StringBuilder result, String name, String value) {
-    result.append("[").append(name).append("=").append(value).append("]");
-  }
-
-  static String getByRoleSelector(AriaRole role, Locator.GetByRoleOptions options) {
-    StringBuilder result = new StringBuilder();
-    result.append("internal:role=").append(role.name().toLowerCase());
-    if (options != null) {
-      if (options.checked != null)
-        addAttr(result, "checked", options.checked.toString());
-      if (options.disabled != null)
-        addAttr(result, "disabled", options.disabled.toString());
-      if (options.selected != null)
-        addAttr(result, "selected", options.selected.toString());
-      if (options.expanded != null)
-        addAttr(result, "expanded", options.expanded.toString());
-      if (options.includeHidden != null)
-        addAttr(result, "include-hidden", options.includeHidden.toString());
-      if (options.level != null)
-        addAttr(result, "level", options.level.toString());
-      if (options.name != null) {
-        String name;
-        if (options.name instanceof String) {
-          name = escapeForAttributeSelector((String) options.name, options.exact != null && options.exact);
-        } else if (options.name instanceof Pattern) {
-          name = toJsRegExp((Pattern) options.name);
-        } else {
-          throw new IllegalArgumentException("options.name can be String or Pattern, found: " + options.name);
-        }
-        addAttr(result, "name", name);
-      }
-      if (options.pressed != null)
-        addAttr(result, "pressed", options.pressed.toString());
-    }
-    return result.toString();
-  }
-
-  static String escapeForTextSelector(Object text, boolean exact) {
-    return escapeForTextSelector(text, exact, false);
-  }
-
-  private static String escapeForTextSelector(Object param, boolean exact, boolean caseSensitive) {
-    if (param instanceof Pattern) {
-      return toJsRegExp((Pattern) param);
-    }
-    if (!(param instanceof String)) {
-      throw new IllegalArgumentException("text parameter must be Pattern or String: " + param);
-    }
-    String text = (String) param;
-    if (exact) {
-      return '"' + text.replace("\"", "\\\"") + '"';
-    }
-
-    if (text.contains("\"") || text.contains(">>") || text.startsWith("/")) {
-      return "/" + escapeForRegex(text).replaceAll("\\s+", "\\\\s+") + "/" + (caseSensitive ? "" : "i");
-    }
-    return text;
-  }
-
-  private static String escapeForRegex(String text) {
-    return text.replaceAll("[.*+?^>${}()|\\[\\]\\\\]", "\\\\\\\\$0");
-  }
-
-  private static String escapeForAttributeSelector(String value, boolean exact) {
-    // TODO: this should actually be
-    //   cssEscape(value).replace(/\\ /g, ' ')
-    // However, our attribute selectors do not conform to CSS parsing spec,
-    // so we escape them differently.
-    return '"' + value.replaceAll("\\\\", "\\\\\\\\").replaceAll("\"", "\\\\\"") + '"' + (exact ? "" : "i");
-  }
-
-  private static String toJsRegExp(Pattern pattern) {
-    return "/" + pattern.pattern() + "/" + toJsRegexFlags(pattern);
-  }
-}

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

@@ -1,21 +0,0 @@
-/*
- * Copyright (c) Microsoft Corporation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.microsoft.playwright.impl;
-
-interface Logger {
-  void log(String message);
-}

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

@@ -60,13 +60,7 @@ class LoggingSupport {
     System.err.println(timestamp + " " + message);
   }
 
-  static void logApiIfEnabled(String message) {
-    if (isEnabled) {
-      logApi(message);
-    }
-  }
-
-  static void logApi(String message) {
+  private void logApi(String message) {
     // This matches log format produced by the server.
     logWithTimestamp("pw:api " + message);
   }

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

@@ -20,7 +20,7 @@ import com.google.gson.JsonObject;
 import com.microsoft.playwright.Mouse;
 
 import static com.microsoft.playwright.impl.Serialization.gson;
-import static com.microsoft.playwright.impl.Utils.convertType;
+import static com.microsoft.playwright.impl.Utils.convertViaJson;
 
 class MouseImpl implements Mouse {
   private final ChannelOwner page;
@@ -54,7 +54,7 @@ class MouseImpl implements Mouse {
     if (options == null) {
       clickOptions = new ClickOptions();
     } else {
-      clickOptions = convertType(options, ClickOptions.class);
+      clickOptions = convertViaJson(options, ClickOptions.class);
     }
     clickOptions.clickCount = 2;
     click(x, y, clickOptions);

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

@@ -17,7 +17,6 @@
 package com.microsoft.playwright.impl;
 
 import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.microsoft.playwright.*;
 import com.microsoft.playwright.options.*;
@@ -25,15 +24,15 @@ import com.microsoft.playwright.options.*;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.*;
-import java.util.function.BooleanSupplier;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
-import static com.microsoft.playwright.impl.Serialization.gson;
-import static com.microsoft.playwright.impl.Utils.*;
 import static com.microsoft.playwright.options.ScreenshotType.JPEG;
 import static com.microsoft.playwright.options.ScreenshotType.PNG;
+import static com.microsoft.playwright.impl.Serialization.gson;
+import static com.microsoft.playwright.impl.Utils.convertViaJson;
+import static com.microsoft.playwright.impl.Utils.isSafeCloseError;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.nio.file.Files.readAllBytes;
 import static java.util.Arrays.asList;
@@ -49,18 +48,23 @@ public class PageImpl extends ChannelOwner implements Page {
   private ViewportSize viewport;
   private final Router routes = new Router();
   private final Set<FrameImpl> frames = new LinkedHashSet<>();
-  private static final Map<EventType, String> eventSubscriptions() {
-    Map<EventType, String> result = new HashMap<>();
-    result.put(EventType.CONSOLE, "console");
-    result.put(EventType.DIALOG, "dialog");
-    result.put(EventType.REQUEST, "request");
-    result.put(EventType.RESPONSE, "response");
-    result.put(EventType.REQUESTFINISHED, "requestFinished");
-    result.put(EventType.REQUESTFAILED, "requestFailed");
-    result.put(EventType.FILECHOOSER, "fileChooser");
-    return result;
-  }
-  final ListenerCollection<EventType> listeners = new ListenerCollection<EventType>(eventSubscriptions(), this);
+  final ListenerCollection<EventType> listeners = new ListenerCollection<EventType>() {
+    @Override
+    void add(EventType eventType, Consumer<?> listener) {
+      if (eventType == EventType.FILECHOOSER) {
+        willAddFileChooserListener();
+      }
+      super.add(eventType, listener);
+    }
+
+    @Override
+    void remove(EventType eventType, Consumer<?> listener) {
+      super.remove(eventType, listener);
+      if (eventType == EventType.FILECHOOSER) {
+        didRemoveFileChooserListener();
+      }
+    }
+  };
   final Map<String, BindingCallback> bindings = new HashMap<>();
   BrowserContextImpl ownedContext;
   private boolean isClosed;
@@ -115,7 +119,22 @@ public class PageImpl extends ChannelOwner implements Page {
 
   @Override
   protected void handleEvent(String event, JsonObject params) {
-    if ("worker".equals(event)) {
+    if ("dialog".equals(event)) {
+      String guid = params.getAsJsonObject("dialog").get("guid").getAsString();
+      DialogImpl dialog = connection.getExistingObject(guid);
+      if (listeners.hasListeners(EventType.DIALOG)) {
+        listeners.notify(EventType.DIALOG, dialog);
+      } else {
+        if ("beforeunload".equals(dialog.type())) {
+          try {
+            dialog.accept();
+          } catch (PlaywrightException e) {
+          }
+        } else {
+          dialog.dismiss();
+        }
+      }
+    } else if ("worker".equals(event)) {
       String guid = params.getAsJsonObject("worker").get("guid").getAsString();
       WorkerImpl worker = connection.getExistingObject(guid);
       worker.page = this;
@@ -125,9 +144,14 @@ public class PageImpl extends ChannelOwner implements Page {
       String guid = params.getAsJsonObject("webSocket").get("guid").getAsString();
       WebSocketImpl webSocket = connection.getExistingObject(guid);
       listeners.notify(EventType.WEBSOCKET, webSocket);
+    } else if ("console".equals(event)) {
+      String guid = params.getAsJsonObject("message").get("guid").getAsString();
+      ConsoleMessageImpl message = connection.getExistingObject(guid);
+      listeners.notify(EventType.CONSOLE, message);
     } else if ("download".equals(event)) {
       String artifactGuid = params.getAsJsonObject("artifact").get("guid").getAsString();
       ArtifactImpl artifact = connection.getExistingObject(artifactGuid);
+      artifact.isRemote = browserContext.browser() != null && browserContext.browser().isRemote;
       DownloadImpl download = new DownloadImpl(this, artifact, params);
       listeners.notify(EventType.DOWNLOAD, download);
     } else if ("fileChooser".equals(event)) {
@@ -146,11 +170,13 @@ public class PageImpl extends ChannelOwner implements Page {
         try {
           bindingCall.call(binding);
         } catch (RuntimeException e) {
-          if (!isSafeCloseError(e.getMessage())) {
-            logWithTimestamp(e.getMessage());
-          }
+          e.printStackTrace();
         }
       }
+    } else if ("load".equals(event)) {
+      listeners.notify(EventType.LOAD, this);
+    } else if ("domcontentloaded".equals(event)) {
+      listeners.notify(EventType.DOMCONTENTLOADED, this);
     } else if ("frameAttached".equals(event)) {
       String guid = params.getAsJsonObject("frame").get("guid").getAsString();
       FrameImpl frame = connection.getExistingObject(guid);
@@ -170,12 +196,11 @@ public class PageImpl extends ChannelOwner implements Page {
       }
       listeners.notify(EventType.FRAMEDETACHED, frame);
     } else if ("route".equals(event)) {
-      RouteImpl route = connection.getExistingObject(params.getAsJsonObject("route").get("guid").getAsString());
-      Router.HandleResult handled = routes.handle(route);
-      if (handled != Router.HandleResult.NoMatchingHandler) {
-        updateInterceptionPatterns();
-      }
-      if (handled == Router.HandleResult.NoMatchingHandler || handled == Router.HandleResult.Fallback) {
+      Route route = connection.getExistingObject(params.getAsJsonObject("route").get("guid").getAsString());
+      boolean handled = routes.handle(route);
+      if (handled) {
+        maybeDisableNetworkInterception();
+      } else {
         browserContext.handleRoute(route);
       }
     } else if ("video".equals(event)) {
@@ -209,6 +234,24 @@ public class PageImpl extends ChannelOwner implements Page {
     listeners.notify(EventType.CLOSE, this);
   }
 
+  private void willAddFileChooserListener() {
+    if (!listeners.hasListeners(EventType.FILECHOOSER)) {
+      updateFileChooserInterception(true);
+    }
+  }
+
+  private void didRemoveFileChooserListener() {
+    if (!listeners.hasListeners(EventType.FILECHOOSER)) {
+      updateFileChooserInterception(false);
+    }
+  }
+
+  private void updateFileChooserInterception(boolean enabled) {
+    JsonObject params = new JsonObject();
+    params.addProperty("intercepted", enabled);
+    sendMessage("setFileChooserInterceptedNoReply", params);
+  }
+
   @Override
   public void onClose(Consumer<Page> handler) {
     listeners.add(EventType.CLOSE, handler);
@@ -401,7 +444,7 @@ public class PageImpl extends ChannelOwner implements Page {
 
   @Override
   public Page waitForClose(WaitForCloseOptions options, Runnable code) {
-    return withWaitLogging("Page.waitForClose", logger -> waitForCloseImpl(options, code));
+    return withWaitLogging("Page.waitForClose", () -> waitForCloseImpl(options, code));
   }
 
   private Page waitForCloseImpl(WaitForCloseOptions options, Runnable code) {
@@ -413,7 +456,7 @@ public class PageImpl extends ChannelOwner implements Page {
 
   @Override
   public ConsoleMessage waitForConsoleMessage(WaitForConsoleMessageOptions options, Runnable code) {
-    return withWaitLogging("Page.waitForConsoleMessage", logger -> waitForConsoleMessageImpl(options, code));
+    return withWaitLogging("Page.waitForConsoleMessage", () -> waitForConsoleMessageImpl(options, code));
   }
 
   private ConsoleMessage waitForConsoleMessageImpl(WaitForConsoleMessageOptions options, Runnable code) {
@@ -425,7 +468,7 @@ public class PageImpl extends ChannelOwner implements Page {
 
   @Override
   public Download waitForDownload(WaitForDownloadOptions options, Runnable code) {
-    return withWaitLogging("Page.waitForDownload", logger -> waitForDownloadImpl(options, code));
+    return withWaitLogging("Page.waitForDownload", () -> waitForDownloadImpl(options, code));
   }
 
   private Download waitForDownloadImpl(WaitForDownloadOptions options, Runnable code) {
@@ -437,7 +480,7 @@ public class PageImpl extends ChannelOwner implements Page {
 
   @Override
   public FileChooser waitForFileChooser(WaitForFileChooserOptions options, Runnable code) {
-    return withWaitLogging("Page.waitForFileChooser", logger -> waitForFileChooserImpl(options, code));
+    return withWaitLogging("Page.waitForFileChooser", () -> waitForFileChooserImpl(options, code));
   }
 
   private FileChooser waitForFileChooserImpl(WaitForFileChooserOptions options, Runnable code) {
@@ -450,7 +493,7 @@ public class PageImpl extends ChannelOwner implements Page {
 
   @Override
   public Page waitForPopup(WaitForPopupOptions options, Runnable code) {
-    return withWaitLogging("Page.waitForPopup", logger -> waitForPopupImpl(options, code));
+    return withWaitLogging("Page.waitForPopup", () -> waitForPopupImpl(options, code));
   }
 
   private Page waitForPopupImpl(WaitForPopupOptions options, Runnable code) {
@@ -462,7 +505,7 @@ public class PageImpl extends ChannelOwner implements Page {
 
   @Override
   public WebSocket waitForWebSocket(WaitForWebSocketOptions options, Runnable code) {
-    return withWaitLogging("Page.waitForWebSocket", logger -> waitForWebSocketImpl(options, code));
+    return withWaitLogging("Page.waitForWebSocket", () -> waitForWebSocketImpl(options, code));
   }
 
   private WebSocket waitForWebSocketImpl(WaitForWebSocketOptions options, Runnable code) {
@@ -474,7 +517,7 @@ public class PageImpl extends ChannelOwner implements Page {
 
   @Override
   public Worker waitForWorker(WaitForWorkerOptions options, Runnable code) {
-    return withWaitLogging("Page.waitForWorker", logger -> waitForWorkerImpl(options, code));
+    return withWaitLogging("Page.waitForWorker", () -> waitForWorkerImpl(options, code));
   }
 
   private Worker waitForWorkerImpl(WaitForWorkerOptions options, Runnable code) {
@@ -494,28 +537,26 @@ public class PageImpl extends ChannelOwner implements Page {
 
   @Override
   public void close(CloseOptions options) {
-    if (options == null) {
-      options = new CloseOptions();
+    if (isClosed) {
+      return;
     }
+    JsonObject params = options == null ? new JsonObject() : gson().toJsonTree(options).getAsJsonObject();
     try {
-      if (ownedContext != null) {
-        ownedContext.close();
-      } else {
-        JsonObject params = gson().toJsonTree(options).getAsJsonObject();
-        sendMessage("close", params);
-      }
+      sendMessage("close", params);
     } catch (PlaywrightException exception) {
-      if (isSafeCloseError(exception) && (options.runBeforeUnload == null || !options.runBeforeUnload)) {
-        return;
+      if (!isSafeCloseError(exception)) {
+        throw exception;
       }
-      throw exception;
+    }
+    if (ownedContext != null) {
+      ownedContext.close();
     }
   }
 
   @Override
   public ElementHandle querySelector(String selector, QuerySelectorOptions options) {
     return withLogging("Page.querySelector", () -> mainFrame.querySelectorImpl(
-      selector, convertType(options, Frame.QuerySelectorOptions.class)));
+      selector, convertViaJson(options, Frame.QuerySelectorOptions.class)));
   }
 
   @Override
@@ -526,7 +567,7 @@ public class PageImpl extends ChannelOwner implements Page {
   @Override
   public Object evalOnSelector(String selector, String pageFunction, Object arg, EvalOnSelectorOptions options) {
     return withLogging("Page.evalOnSelector", () -> mainFrame.evalOnSelectorImpl(
-      selector, pageFunction, arg, convertType(options, Frame.EvalOnSelectorOptions.class)));
+      selector, pageFunction, arg, convertViaJson(options, Frame.EvalOnSelectorOptions.class)));
   }
 
   @Override
@@ -560,13 +601,13 @@ public class PageImpl extends ChannelOwner implements Page {
   @Override
   public ElementHandle addScriptTag(AddScriptTagOptions options) {
     return withLogging("Page.addScriptTag",
-      () -> mainFrame.addScriptTagImpl(convertType(options, Frame.AddScriptTagOptions.class)));
+      () -> mainFrame.addScriptTagImpl(convertViaJson(options, Frame.AddScriptTagOptions.class)));
   }
 
   @Override
   public ElementHandle addStyleTag(AddStyleTagOptions options) {
     return withLogging("Page.addStyleTag",
-      () -> mainFrame.addStyleTagImpl(convertType(options, Frame.AddStyleTagOptions.class)));
+      () -> mainFrame.addStyleTagImpl(convertViaJson(options, Frame.AddStyleTagOptions.class)));
   }
 
   @Override
@@ -577,13 +618,13 @@ public class PageImpl extends ChannelOwner implements Page {
   @Override
   public void check(String selector, CheckOptions options) {
     withLogging("Page.check",
-      () -> mainFrame.checkImpl(selector, convertType(options, Frame.CheckOptions.class)));
+      () -> mainFrame.checkImpl(selector, convertViaJson(options, Frame.CheckOptions.class)));
   }
 
   @Override
   public void click(String selector, ClickOptions options) {
     withLogging("Page.click",
-      () -> mainFrame.clickImpl(selector, convertType(options, Frame.ClickOptions.class)));
+      () -> mainFrame.clickImpl(selector, convertViaJson(options, Frame.ClickOptions.class)));
   }
 
   @Override
@@ -599,13 +640,13 @@ public class PageImpl extends ChannelOwner implements Page {
   @Override
   public void dblclick(String selector, DblclickOptions options) {
     withLogging("Page.dblclick",
-      () -> mainFrame.dblclickImpl(selector, convertType(options, Frame.DblclickOptions.class)));
+      () -> mainFrame.dblclickImpl(selector, convertViaJson(options, Frame.DblclickOptions.class)));
   }
 
   @Override
   public void dispatchEvent(String selector, String type, Object eventInit, DispatchEventOptions options) {
     withLogging("Page.dispatchEvent",
-      () -> mainFrame.dispatchEventImpl(selector, type, eventInit, convertType(options, Frame.DispatchEventOptions.class)));
+      () -> mainFrame.dispatchEventImpl(selector, type, eventInit, convertViaJson(options, Frame.DispatchEventOptions.class)));
   }
 
   @Override
@@ -662,13 +703,13 @@ public class PageImpl extends ChannelOwner implements Page {
   @Override
   public void fill(String selector, String value, FillOptions options) {
     withLogging("Page.fill",
-      () -> mainFrame.fillImpl(selector, value, convertType(options, Frame.FillOptions.class)));
+      () -> mainFrame.fillImpl(selector, value, convertViaJson(options, Frame.FillOptions.class)));
   }
 
   @Override
   public void focus(String selector, FocusOptions options) {
     withLogging("Page.focus",
-      () -> mainFrame.focusImpl(selector, convertType(options, Frame.FocusOptions.class)));
+      () -> mainFrame.focusImpl(selector, convertViaJson(options, Frame.FocusOptions.class)));
   }
 
   @Override
@@ -718,83 +759,7 @@ public class PageImpl extends ChannelOwner implements Page {
   @Override
   public String getAttribute(String selector, String name, GetAttributeOptions options) {
     return withLogging("Page.getAttribute",
-      () -> mainFrame.getAttributeImpl(selector, name, convertType(options, Frame.GetAttributeOptions.class)));
-  }
-
-  @Override
-  public Locator getByAltText(String text, GetByAltTextOptions options) {
-    return withLogging("Page.getAttribute",
-      () -> mainFrame.getByAltText(text, convertType(options, Frame.GetByAltTextOptions.class)));
-  }
-
-  @Override
-  public Locator getByAltText(Pattern text, GetByAltTextOptions options) {
-    return withLogging("Page.getByAltText",
-      () -> mainFrame.getByAltText(text, convertType(options, Frame.GetByAltTextOptions.class)));
-  }
-
-  @Override
-  public Locator getByLabel(String text, GetByLabelOptions options) {
-    return withLogging("Page.getByLabel",
-      () -> mainFrame.getByLabel(text, convertType(options, Frame.GetByLabelOptions.class)));
-  }
-
-  @Override
-  public Locator getByLabel(Pattern text, GetByLabelOptions options) {
-    return withLogging("Page.getByLabel",
-      () -> mainFrame.getByLabel(text, convertType(options, Frame.GetByLabelOptions.class)));
-  }
-
-  @Override
-  public Locator getByPlaceholder(String text, GetByPlaceholderOptions options) {
-    return withLogging("Page.getByPlaceholder",
-      () -> mainFrame.getByPlaceholder(text, convertType(options, Frame.GetByPlaceholderOptions.class)));
-  }
-
-  @Override
-  public Locator getByPlaceholder(Pattern text, GetByPlaceholderOptions options) {
-    return withLogging("Page.getByPlaceholder",
-      () -> mainFrame.getByPlaceholder(text, convertType(options, Frame.GetByPlaceholderOptions.class)));
-  }
-
-  @Override
-  public Locator getByRole(AriaRole role, GetByRoleOptions options) {
-    return withLogging("Page.getByRole",
-      () -> mainFrame.getByRole(role, convertType(options, Frame.GetByRoleOptions.class)));
-  }
-
-  @Override
-  public Locator getByTestId(String testId) {
-    return withLogging("Page.getByTestId", () -> mainFrame.getByTestId(testId));
-  }
-
-  @Override
-  public Locator getByTestId(Pattern testId) {
-    return withLogging("Page.getByTestId", () -> mainFrame.getByTestId(testId));
-  }
-
-  @Override
-  public Locator getByText(String text, GetByTextOptions options) {
-    return withLogging("Page.getByText",
-      () -> mainFrame.getByText(text, convertType(options, Frame.GetByTextOptions.class)));
-  }
-
-  @Override
-  public Locator getByText(Pattern text, GetByTextOptions options) {
-    return withLogging("Page.getByText",
-      () -> mainFrame.getByText(text, convertType(options, Frame.GetByTextOptions.class)));
-  }
-
-  @Override
-  public Locator getByTitle(String text, GetByTitleOptions options) {
-    return withLogging("Page.getByTitle",
-      () -> mainFrame.getByTitle(text, convertType(options, Frame.GetByTitleOptions.class)));
-  }
-
-  @Override
-  public Locator getByTitle(Pattern text, GetByTitleOptions options) {
-    return withLogging("Page.getByTitle",
-      () -> mainFrame.getByTitle(text, convertType(options, Frame.GetByTitleOptions.class)));
+      () -> mainFrame.getAttributeImpl(selector, name, convertViaJson(options, Frame.GetAttributeOptions.class)));
   }
 
   @Override
@@ -833,41 +798,44 @@ public class PageImpl extends ChannelOwner implements Page {
 
   @Override
   public ResponseImpl navigate(String url, NavigateOptions options) {
-    return withLogging("Page.navigate", () -> mainFrame.navigateImpl(url, convertType(options, Frame.NavigateOptions.class)));
+    return withLogging("Page.navigate", () ->
+      mainFrame.navigateImpl(url, convertViaJson(options, Frame.NavigateOptions.class)));
   }
 
   @Override
   public void hover(String selector, HoverOptions options) {
-    withLogging("Page.hover", () -> mainFrame.hoverImpl(selector, convertType(options, Frame.HoverOptions.class)));
+    withLogging("Page.hover", () ->
+      mainFrame.hoverImpl(selector, convertViaJson(options, Frame.HoverOptions.class)));
   }
 
   @Override
   public void dragAndDrop(String source, String target, DragAndDropOptions options) {
-    withLogging("Page.dragAndDrop", () -> mainFrame.dragAndDropImpl(source, target, convertType(options, Frame.DragAndDropOptions.class)));
+    withLogging("Page.dragAndDrop", () ->
+      mainFrame.dragAndDropImpl(source, target, convertViaJson(options, Frame.DragAndDropOptions.class)));
   }
 
   @Override
   public String innerHTML(String selector, InnerHTMLOptions options) {
     return withLogging("Page.innerHTML",
-      () -> mainFrame.innerHTMLImpl(selector, convertType(options, Frame.InnerHTMLOptions.class)));
+      () -> mainFrame.innerHTMLImpl(selector, convertViaJson(options, Frame.InnerHTMLOptions.class)));
   }
 
   @Override
   public String innerText(String selector, InnerTextOptions options) {
     return withLogging("Page.innerText",
-      () -> mainFrame.innerTextImpl(selector, convertType(options, Frame.InnerTextOptions.class)));
+      () -> mainFrame.innerTextImpl(selector, convertViaJson(options, Frame.InnerTextOptions.class)));
   }
 
   @Override
   public String inputValue(String selector, InputValueOptions options) {
     return withLogging("Page.inputValue",
-      () -> mainFrame.inputValueImpl(selector, convertType(options, Frame.InputValueOptions.class)));
+      () -> mainFrame.inputValueImpl(selector, convertViaJson(options, Frame.InputValueOptions.class)));
   }
 
   @Override
   public boolean isChecked(String selector, IsCheckedOptions options) {
     return withLogging("Page.isChecked",
-      () -> mainFrame.isCheckedImpl(selector, convertType(options, Frame.IsCheckedOptions.class)));
+      () -> mainFrame.isCheckedImpl(selector, convertViaJson(options, Frame.IsCheckedOptions.class)));
   }
 
   @Override
@@ -878,31 +846,31 @@ public class PageImpl extends ChannelOwner implements Page {
   @Override
   public boolean isDisabled(String selector, IsDisabledOptions options) {
     return withLogging("Page.isDisabled",
-      () -> mainFrame.isDisabledImpl(selector, convertType(options, Frame.IsDisabledOptions.class)));
+      () -> mainFrame.isDisabledImpl(selector, convertViaJson(options, Frame.IsDisabledOptions.class)));
   }
 
   @Override
   public boolean isEditable(String selector, IsEditableOptions options) {
     return withLogging("Page.isEditable",
-      () -> mainFrame.isEditableImpl(selector, convertType(options, Frame.IsEditableOptions.class)));
+      () -> mainFrame.isEditableImpl(selector, convertViaJson(options, Frame.IsEditableOptions.class)));
   }
 
   @Override
   public boolean isEnabled(String selector, IsEnabledOptions options) {
     return withLogging("Page.isEnabled",
-      () -> mainFrame.isEnabledImpl(selector, convertType(options, Frame.IsEnabledOptions.class)));
+      () -> mainFrame.isEnabledImpl(selector, convertViaJson(options, Frame.IsEnabledOptions.class)));
   }
 
   @Override
   public boolean isHidden(String selector, IsHiddenOptions options) {
     return withLogging("Page.isHidden",
-      () -> mainFrame.isHiddenImpl(selector, convertType(options, Frame.IsHiddenOptions.class)));
+      () -> mainFrame.isHiddenImpl(selector, convertViaJson(options, Frame.IsHiddenOptions.class)));
   }
 
   @Override
   public boolean isVisible(String selector, IsVisibleOptions options) {
     return withLogging("Page.isVisible",
-      () -> mainFrame.isVisibleImpl(selector, convertType(options, Frame.IsVisibleOptions.class)));
+      () -> mainFrame.isVisibleImpl(selector, convertViaJson(options, Frame.IsVisibleOptions.class)));
   }
 
   @Override
@@ -911,8 +879,8 @@ public class PageImpl extends ChannelOwner implements Page {
   }
 
   @Override
-  public Locator locator(String selector, LocatorOptions options) {
-    return mainFrame.locator(selector, convertType(options, Frame.LocatorOptions.class));
+  public LocatorImpl locator(String selector) {
+    return mainFrame.locator(selector);
   }
 
   @Override
@@ -935,17 +903,8 @@ public class PageImpl extends ChannelOwner implements Page {
 
   @Override
   public void pause() {
-    withLogging("Page.pause", () -> {
-      Double defaultNavigationTimeout = browserContext.timeoutSettings.defaultNavigationTimeout();
-      Double defaultTimeout = browserContext.timeoutSettings.defaultTimeout();
-      browserContext.setDefaultNavigationTimeoutImpl(0.0);
-      browserContext.setDefaultTimeoutImpl(0.0);
-      try {
-        runUntil(() -> {}, new WaitableRace<>(asList(context().pause(), (Waitable<JsonElement>) waitableClosedOrCrashed)));
-      } finally {
-        browserContext.setDefaultNavigationTimeoutImpl(defaultNavigationTimeout);
-        browserContext.setDefaultTimeoutImpl(defaultTimeout);
-      }
+    withLogging("BrowserContext.pause", () -> {
+      context().pause();
     });
   }
 
@@ -955,6 +914,9 @@ public class PageImpl extends ChannelOwner implements Page {
   }
 
   private byte[] pdfImpl(PdfOptions options) {
+    if (!browserContext.browser().isChromium()) {
+      throw new PlaywrightException("Page.pdf only supported in headless Chromium");
+    }
     if (options == null) {
       options = new PdfOptions();
     }
@@ -971,7 +933,7 @@ public class PageImpl extends ChannelOwner implements Page {
   @Override
   public void press(String selector, String key, PressOptions options) {
     withLogging("Page.press",
-      () -> mainFrame.pressImpl(selector, key, convertType(options, Frame.PressOptions.class)));
+      () -> mainFrame.pressImpl(selector, key, convertViaJson(options, Frame.PressOptions.class)));
   }
 
   @Override
@@ -979,11 +941,6 @@ public class PageImpl extends ChannelOwner implements Page {
     return withLogging("Page.reload", () -> reloadImpl(options));
   }
 
-  @Override
-  public APIRequestContextImpl request() {
-    return browserContext.request();
-  }
-
   private Response reloadImpl(ReloadOptions options) {
     if (options == null) {
       options = new ReloadOptions();
@@ -1011,25 +968,14 @@ public class PageImpl extends ChannelOwner implements Page {
     route(new UrlMatcher(url), handler, options);
   }
 
-  @Override
-  public void routeFromHAR(Path har, RouteFromHAROptions options) {
-    if (options == null) {
-      options = new RouteFromHAROptions();
-    }
-    if (options.update != null && options.update) {
-      browserContext.recordIntoHar(this, har, convertType(options, BrowserContext.RouteFromHAROptions.class));
-      return;
-    }
-    UrlMatcher matcher = UrlMatcher.forOneOf(browserContext.baseUrl, options.url);
-    HARRouter harRouter = new HARRouter(connection.localUtils, har, options.notFound);
-    onClose(context -> harRouter.dispose());
-    route(matcher, route -> harRouter.handle(route), null);
-  }
-
   private void route(UrlMatcher matcher, Consumer<Route> handler, RouteOptions options) {
     withLogging("Page.route", () -> {
       routes.add(matcher, handler, options == null ? null : options.times);
-      updateInterceptionPatterns();
+      if (routes.size() == 1) {
+        JsonObject params = new JsonObject();
+        params.addProperty("enabled", true);
+        sendMessage("setNetworkInterceptionEnabled", params);
+      }
     });
   }
 
@@ -1038,6 +984,8 @@ public class PageImpl extends ChannelOwner implements Page {
     return withLogging("Page.screenshot", () -> screenshotImpl(options));
   }
 
+
+
   @Override
   public List<String> selectOption(String selector, String value, SelectOptionOptions options) {
     String[] values = value == null ? null : new String[]{ value };
@@ -1052,8 +1000,11 @@ public class PageImpl extends ChannelOwner implements Page {
 
   @Override
   public List<String> selectOption(String selector, String[] values, SelectOptionOptions options) {
-    return withLogging("Page.selectOption",
-      () -> mainFrame.selectOptionImpl(selector, values, convertType(options, Frame.SelectOptionOptions.class)));
+    if (values == null) {
+      return selectOption(selector, new SelectOption[0], options);
+    }
+    return selectOption(selector, Arrays.asList(values).stream().map(
+      v -> new SelectOption().setValue(v)).toArray(SelectOption[]::new), options);
   }
 
   @Override
@@ -1079,18 +1030,8 @@ public class PageImpl extends ChannelOwner implements Page {
         }
       }
     }
-    List<Locator> mask = options.mask;
-    options.mask = null;
     JsonObject params = gson().toJsonTree(options).getAsJsonObject();
-    options.mask = mask;
     params.remove("path");
-    if (mask != null) {
-      JsonArray maskArray = new JsonArray();
-      for (Locator locator: mask) {
-        maskArray.add(((LocatorImpl) locator).toProtocol());
-      }
-      params.add("mask", maskArray);
-    }
     JsonObject json = sendMessage("screenshot", params).getAsJsonObject();
 
     byte[] buffer = Base64.getDecoder().decode(json.get("binary").getAsString());
@@ -1103,25 +1044,25 @@ public class PageImpl extends ChannelOwner implements Page {
   @Override
   public List<String> selectOption(String selector, SelectOption[] values, SelectOptionOptions options) {
     return withLogging("Page.selectOption",
-      () -> mainFrame.selectOptionImpl(selector, values, convertType(options, Frame.SelectOptionOptions.class)));
+      () -> mainFrame.selectOptionImpl(selector, values, convertViaJson(options, Frame.SelectOptionOptions.class)));
   }
 
   @Override
   public List<String> selectOption(String selector, ElementHandle[] values, SelectOptionOptions options) {
     return withLogging("Page.selectOption",
-      () -> mainFrame.selectOptionImpl(selector, values, convertType(options, Frame.SelectOptionOptions.class)));
+      () -> mainFrame.selectOptionImpl(selector, values, convertViaJson(options, Frame.SelectOptionOptions.class)));
   }
 
   @Override
   public void setChecked(String selector, boolean checked, SetCheckedOptions options) {
     withLogging("Page.setChecked",
-      () -> mainFrame.setCheckedImpl(selector, checked, convertType(options, Frame.SetCheckedOptions.class)));
+      () -> mainFrame.setCheckedImpl(selector, checked, convertViaJson(options, Frame.SetCheckedOptions.class)));
   }
 
   @Override
   public void setContent(String html, SetContentOptions options) {
     withLogging("Page.setContent",
-      () -> mainFrame.setContentImpl(html, convertType(options, Frame.SetContentOptions.class)));
+      () -> mainFrame.setContentImpl(html, convertViaJson(options, Frame.SetContentOptions.class)));
   }
 
   @Override
@@ -1168,7 +1109,7 @@ public class PageImpl extends ChannelOwner implements Page {
   @Override
   public void setInputFiles(String selector, Path[] files, SetInputFilesOptions options) {
     withLogging("Page.setInputFiles",
-      () -> mainFrame.setInputFilesImpl(selector, files, convertType(options, Frame.SetInputFilesOptions.class)));
+      () -> mainFrame.setInputFilesImpl(selector, files, convertViaJson(options, Frame.SetInputFilesOptions.class)));
   }
 
   @Override
@@ -1179,7 +1120,7 @@ public class PageImpl extends ChannelOwner implements Page {
   @Override
   public void setInputFiles(String selector, FilePayload[] files, SetInputFilesOptions options) {
     withLogging("Page.setInputFiles",
-      () -> mainFrame.setInputFilesImpl(selector, files, convertType(options, Frame.SetInputFilesOptions.class)));
+      () -> mainFrame.setInputFilesImpl(selector, files, convertViaJson(options, Frame.SetInputFilesOptions.class)));
   }
 
   @Override
@@ -1195,13 +1136,13 @@ public class PageImpl extends ChannelOwner implements Page {
   @Override
   public void tap(String selector, TapOptions options) {
     withLogging("Page.tap",
-      () -> mainFrame.tapImpl(selector, convertType(options, Frame.TapOptions.class)));
+      () -> mainFrame.tapImpl(selector, convertViaJson(options, Frame.TapOptions.class)));
   }
 
   @Override
   public String textContent(String selector, TextContentOptions options) {
     return withLogging("Page.textContent",
-      () -> mainFrame.textContentImpl(selector, convertType(options, Frame.TextContentOptions.class)));
+      () -> mainFrame.textContentImpl(selector, convertViaJson(options, Frame.TextContentOptions.class)));
   }
 
   @Override
@@ -1217,13 +1158,13 @@ public class PageImpl extends ChannelOwner implements Page {
   @Override
   public void type(String selector, String text, TypeOptions options) {
     withLogging("Page.type",
-      () -> mainFrame.typeImpl(selector, text, convertType(options, Frame.TypeOptions.class)));
+      () -> mainFrame.typeImpl(selector, text, convertViaJson(options, Frame.TypeOptions.class)));
   }
 
   @Override
   public void uncheck(String selector, UncheckOptions options) {
     withLogging("Page.uncheck",
-      () -> mainFrame.uncheckImpl(selector, convertType(options, Frame.UncheckOptions.class)));
+      () -> mainFrame.uncheckImpl(selector, convertViaJson(options, Frame.UncheckOptions.class)));
   }
 
   @Override
@@ -1244,12 +1185,16 @@ public class PageImpl extends ChannelOwner implements Page {
   private void unroute(UrlMatcher matcher, Consumer<Route> handler) {
     withLogging("Page.unroute", () -> {
       routes.remove(matcher, handler);
-      updateInterceptionPatterns();
+      maybeDisableNetworkInterception();
     });
   }
 
-  private void updateInterceptionPatterns() {
-    sendMessage("setNetworkInterceptionPatterns", routes.interceptionPatterns());
+  private void maybeDisableNetworkInterception() {
+    if (routes.size() == 0) {
+      JsonObject params = new JsonObject();
+      params.addProperty("enabled", false);
+      sendMessage("setNetworkInterceptionEnabled", params);
+    }
   }
 
   @Override
@@ -1292,30 +1237,30 @@ public class PageImpl extends ChannelOwner implements Page {
   @Override
   public JSHandle waitForFunction(String pageFunction, Object arg, WaitForFunctionOptions options) {
     return withLogging("Page.waitForFunction",
-      () -> mainFrame.waitForFunctionImpl(pageFunction, arg, convertType(options, Frame.WaitForFunctionOptions.class)));
+      () -> mainFrame.waitForFunctionImpl(pageFunction, arg, convertViaJson(options, Frame.WaitForFunctionOptions.class)));
   }
 
   @Override
   public void waitForLoadState(LoadState state, WaitForLoadStateOptions options) {
-    withWaitLogging("Page.waitForLoadState", logger -> {
-      mainFrame.waitForLoadStateImpl(state, convertType(options, Frame.WaitForLoadStateOptions.class), logger);
+    withWaitLogging("Page.waitForLoadState", () -> {
+      mainFrame.waitForLoadStateImpl(state, convertViaJson(options, Frame.WaitForLoadStateOptions.class));
       return null;
     });
   }
 
   @Override
   public Response waitForNavigation(WaitForNavigationOptions options, Runnable code) {
-    return withWaitLogging("Page.waitForNavigation", logger -> waitForNavigationImpl(logger, code, options));
+    return withLogging("Page.waitForNavigation", () -> waitForNavigationImpl(code, options));
   }
 
-  private Response waitForNavigationImpl(Logger logger, Runnable code, WaitForNavigationOptions options) {
+  Response waitForNavigationImpl(Runnable code, WaitForNavigationOptions options) {
     Frame.WaitForNavigationOptions frameOptions = new Frame.WaitForNavigationOptions();
     if (options != null) {
       frameOptions.timeout = options.timeout;
       frameOptions.waitUntil = options.waitUntil;
       frameOptions.url = options.url;
     }
-    return mainFrame.waitForNavigationImpl(logger, code, frameOptions);
+    return mainFrame.waitForNavigationImpl(code, frameOptions);
   }
 
   void frameNavigated(FrameImpl frame) {
@@ -1367,28 +1312,21 @@ public class PageImpl extends ChannelOwner implements Page {
 
   @Override
   public Request waitForRequest(String urlGlob, WaitForRequestOptions options, Runnable code) {
-    return waitForRequest(new UrlMatcher(browserContext.baseUrl, urlGlob), null, options, code);
+    return waitForRequest(toRequestPredicate(new UrlMatcher(browserContext.baseUrl, urlGlob)), options, code);
   }
 
   @Override
   public Request waitForRequest(Pattern urlPattern, WaitForRequestOptions options, Runnable code) {
-    return waitForRequest(new UrlMatcher(urlPattern), null, options, code);
+    return waitForRequest(toRequestPredicate(new UrlMatcher(urlPattern)), options, code);
   }
 
   @Override
   public Request waitForRequest(Predicate<Request> predicate, WaitForRequestOptions options, Runnable code) {
-    return waitForRequest(null, predicate, options, code);
+    return withWaitLogging("Page.waitForRequest", () -> waitForRequestImpl(predicate, options, code));
   }
 
-  private Request waitForRequest(UrlMatcher urlMatcher, Predicate<Request> predicate, WaitForRequestOptions options, Runnable code) {
-    return withWaitLogging("Page.waitForRequest", logger -> {
-      logger.log("waiting for request " + ((urlMatcher == null) ? "matching predicate" : urlMatcher.toString()));
-      Predicate<Request> requestPredicate = predicate;
-      if (requestPredicate == null) {
-        requestPredicate = request -> urlMatcher.test(request.url());;
-      }
-      return waitForRequestImpl(requestPredicate, options, code);
-    });
+  private static Predicate<Request> toRequestPredicate(UrlMatcher matcher) {
+    return request -> matcher.test(request.url());
   }
 
   private Request waitForRequestImpl(Predicate<Request> predicate, WaitForRequestOptions options, Runnable code) {
@@ -1400,7 +1338,7 @@ public class PageImpl extends ChannelOwner implements Page {
 
   @Override
   public Request waitForRequestFinished(WaitForRequestFinishedOptions options, Runnable code) {
-    return withWaitLogging("Page.waitForRequestFinished", logger -> waitForRequestFinishedImpl(options, code));
+    return withWaitLogging("Page.waitForRequestFinished", () -> waitForRequestFinishedImpl(options, code));
   }
 
   private Request waitForRequestFinishedImpl(WaitForRequestFinishedOptions options, Runnable code) {
@@ -1412,28 +1350,21 @@ public class PageImpl extends ChannelOwner implements Page {
 
   @Override
   public Response waitForResponse(String urlGlob, WaitForResponseOptions options, Runnable code) {
-    return waitForResponse(new UrlMatcher(browserContext.baseUrl, urlGlob), null, options, code);
+    return waitForResponse(toResponsePredicate(new UrlMatcher(browserContext.baseUrl, urlGlob)), options, code);
   }
 
   @Override
   public Response waitForResponse(Pattern urlPattern, WaitForResponseOptions options, Runnable code) {
-    return waitForResponse(new UrlMatcher(urlPattern), null, options, code);
+    return waitForResponse(toResponsePredicate(new UrlMatcher(urlPattern)), options, code);
   }
 
   @Override
   public Response waitForResponse(Predicate<Response> predicate, WaitForResponseOptions options, Runnable code) {
-    return waitForResponse(null, predicate, options, code);
+    return withLogging("Page.waitForResponse", () -> waitForResponseImpl(predicate, options, code));
   }
 
-  private Response waitForResponse(UrlMatcher urlMatcher, Predicate<Response> predicate, WaitForResponseOptions options, Runnable code) {
-    return withWaitLogging("Page.waitForResponse", logger -> {
-      logger.log("waiting for response " + ((urlMatcher == null) ? "matching predicate" : urlMatcher.toString()));
-      Predicate<Response> responsePredicate = predicate;
-      if (responsePredicate == null) {
-        responsePredicate = response -> urlMatcher.test(response.url());;
-      }
-      return waitForResponseImpl(responsePredicate, options, code);
-    });
+  private static Predicate<Response> toResponsePredicate(UrlMatcher matcher) {
+    return response -> matcher.test(response.url());
   }
 
   private Response waitForResponseImpl(Predicate<Response> predicate, WaitForResponseOptions options, Runnable code) {
@@ -1446,16 +1377,7 @@ public class PageImpl extends ChannelOwner implements Page {
   @Override
   public ElementHandle waitForSelector(String selector, WaitForSelectorOptions options) {
     return withLogging("Page.waitForSelector",
-      () -> mainFrame.waitForSelectorImpl(selector, convertType(options, Frame.WaitForSelectorOptions.class)));
-  }
-
-  @Override
-  public void waitForCondition(BooleanSupplier predicate, WaitForConditionOptions options) {
-    List<Waitable<Void>> waitables = new ArrayList<>();
-    waitables.add(createWaitForCloseHelper());
-    waitables.add(createWaitableTimeout(options == null ? null : options.timeout));
-    waitables.add(new WaitablePredicate<>(predicate));
-    runUntil(() -> {}, new WaitableRace<>(waitables));
+      () -> mainFrame.waitForSelectorImpl(selector, convertViaJson(options, Frame.WaitForSelectorOptions.class)));
   }
 
   @Override
@@ -1479,10 +1401,7 @@ public class PageImpl extends ChannelOwner implements Page {
   }
 
   private void waitForURL(UrlMatcher matcher, WaitForURLOptions options) {
-    withWaitLogging("Page.waitForURL", logger -> {
-      mainFrame.waitForURLImpl(logger, matcher, convertType(options, Frame.WaitForURLOptions.class));
-      return null;
-    });
+    withLogging("Page.waitForURL", () -> mainFrame.waitForURLImpl(matcher, convertViaJson(options, Frame.WaitForURLOptions.class)));
   }
 
   @Override

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

@@ -17,13 +17,12 @@
 package com.microsoft.playwright.impl;
 
 import com.google.gson.JsonObject;
-import com.microsoft.playwright.APIRequest;
 import com.microsoft.playwright.Playwright;
 import com.microsoft.playwright.PlaywrightException;
 import com.microsoft.playwright.Selectors;
-import com.microsoft.playwright.impl.driver.Driver;
 
 import java.io.IOException;
+import java.nio.file.Path;
 import java.util.Collections;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
@@ -32,23 +31,17 @@ public class PlaywrightImpl extends ChannelOwner implements Playwright {
   private Process driverProcess;
 
   public static PlaywrightImpl create(CreateOptions options) {
-    return createImpl(options, false);
-  }
-
-  public static PlaywrightImpl createImpl(CreateOptions options, boolean forceNewDriverInstanceForTests) {
-    Map<String, String> env = Collections.emptyMap();
-    if (options != null && options.env != null) {
-      env = options.env;
-    }
-    Driver driver = forceNewDriverInstanceForTests ?
-      Driver.createAndInstall(env, true) :
-      Driver.ensureDriverInstalled(env, true);
     try {
-      ProcessBuilder pb = driver.createProcessBuilder();
-      pb.command().add("run-driver");
+      Map<String, String> env = Collections.emptyMap();
+      if (options != null && options.env != null) {
+        env = options.env;
+      }
+      Path driver = Driver.ensureDriverInstalled(env);
+      ProcessBuilder pb = new ProcessBuilder(driver.toString(), "run-driver");
       pb.redirectError(ProcessBuilder.Redirect.INHERIT);
+      pb.environment().putAll(env);
       Process p = pb.start();
-      Connection connection = new Connection(new PipeTransport(p.getInputStream(), p.getOutputStream()), env);
+      Connection connection = new Connection(new PipeTransport(p.getInputStream(), p.getOutputStream()));
       PlaywrightImpl result = connection.initializePlaywright();
       result.driverProcess = p;
       result.initSharedSelectors(null);
@@ -62,9 +55,7 @@ public class PlaywrightImpl extends ChannelOwner implements Playwright {
   private final BrowserTypeImpl firefox;
   private final BrowserTypeImpl webkit;
   private final SelectorsImpl selectors;
-  private final APIRequestImpl apiRequest;
-  private final LocalUtils localUtils;
-  private SharedSelectors sharedSelectors;
+  private SharedSelectors sharedSelectors;;
 
   PlaywrightImpl(ChannelOwner parent, String type, String guid, JsonObject initializer) {
     super(parent, type, guid, initializer);
@@ -73,17 +64,12 @@ public class PlaywrightImpl extends ChannelOwner implements Playwright {
     webkit = parent.connection.getExistingObject(initializer.getAsJsonObject("webkit").get("guid").getAsString());
 
     selectors = connection.getExistingObject(initializer.getAsJsonObject("selectors").get("guid").getAsString());
-    apiRequest = new APIRequestImpl(this);
-    localUtils = connection.getExistingObject(initializer.getAsJsonObject("utils").get("guid").getAsString());
-    chromium.localUtils = localUtils;
-    firefox.localUtils = localUtils;
-    webkit.localUtils = localUtils;
   }
 
   void initSharedSelectors(PlaywrightImpl parent) {
     assert sharedSelectors == null;
     if (parent == null) {
-      sharedSelectors = new SharedSelectors();
+      sharedSelectors = new SharedSelectors();;
     } else {
       sharedSelectors = parent.sharedSelectors;
     }
@@ -104,11 +90,6 @@ public class PlaywrightImpl extends ChannelOwner implements Playwright {
     return firefox;
   }
 
-  @Override
-  public APIRequest request() {
-    return apiRequest;
-  }
-
   @Override
   public BrowserTypeImpl webkit() {
     return webkit;

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

@@ -31,7 +31,6 @@ class SerializedValue{
   // Possible values: { 'null, 'undefined, 'NaN, 'Infinity, '-Infinity, '-0 }
   String v;
   String d;
-  String u;
   public static class R {
     String p;
     String f;
@@ -44,8 +43,6 @@ class SerializedValue{
   }
   O[] o;
   Number h;
-  Integer id;
-  Integer ref;
 }
 
 class SerializedArgument{
@@ -86,7 +83,6 @@ class ExpectedTextValue {
   String string;
   String regexSource;
   String regexFlags;
-  Boolean ignoreCase;
   Boolean matchSubstring;
   Boolean normalizeWhiteSpace;
 }
@@ -94,7 +90,7 @@ class ExpectedTextValue {
 class FrameExpectOptions {
   Object expressionArg;
   List<ExpectedTextValue> expectedText;
-  Double expectedNumber;
+  Integer expectedNumber;
   SerializedArgument expectedValue;
   Boolean useInnerText;
   boolean isNot;