fix: remove stray logging (#435 )

chore(release): set version to 1.11.0 (#431 )
2026-05-23 03:03:15 +00:00 · 2021-05-07 16:30:12 -07:00 · 2021-05-07 11:17:54 -07:00
293 changed files with 4729 additions and 37438 deletions
@@ -1,57 +0,0 @@
-trigger:
-  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'
@@ -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
@@ -1,41 +0,0 @@
---
-name: Bug Report
-about: Something doesn't work like it should? Tell us!
-title: "[BUG]"
-labels: ''
-assignees: ''
-
---
-
-**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]
-
-<!-- CLI to auto-capture this info -->
-<!-- npx envinfo --preset playwright --markdown -->
-
-**Code Snippet**
-
-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.*;
-
-public class ExampleReproducible {
-  public static void main(String[] args) {
-    try (Playwright playwright = Playwright.create()) {
-      Browser browser = playwright.chromium().launch();
-      BrowserContext context = browser.newContext();
-      Page page = context.newPage();
-      // ...
-    }
-  }
-}
-```
-
-**Describe the bug**
-
-Add any other details about the problem here.
@@ -1,4 +0,0 @@
-contact_links:
-  - name: Join our Slack community
-    url: https://aka.ms/playwright-slack
-    about: Ask questions and discuss with other community members
@@ -1,11 +0,0 @@
---
-name: Feature request
-about: Request new features to be added
-title: "[Feature]"
-labels: ''
-assignees: ''
-
---
-
-Let us know what functionality you'd like to see in Playwright and what your use case is.
-Do you think others might benefit from this as well?
@@ -1,10 +0,0 @@
---
-name: I have a question
-about: Feel free to ask us your questions!
-title: "[Question]"
-labels: ''
-assignees: ''
-
---
-
-
@@ -1,38 +0,0 @@
---
-name: Report regression
-about: Functionality that used to work and does not any more
-title: "[REGRESSION]: "
-labels: ''
-assignees: ''
-
---
-
-**Context:**
- GOOD Playwright Version: [what Playwright version worked nicely?]
- BAD Playwright Version: [what Playwright version doesn't work any more?]
- Operating System: [e.g. Windows, Linux or Mac]
- Extra: [any specific details about your environment]
-
-**Code Snippet**
-
-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.*;
-
-public class ExampleReproducible {
-  public static void main(String[] args) {
-    try (Playwright playwright = Playwright.create()) {
-      Browser browser = playwright.chromium().launch();
-      BrowserContext context = browser.newContext();
-      Page page = context.newPage();
-      // ...
-    }
-  }
-}
-```
-
-**Describe the bug**
-
-Add any other details about the problem here.
@@ -0,0 +1,30 @@
+name: Publish
+on:
+  workflow_dispatch
+jobs:
+  build:
+    timeout-minutes: 30
+    strategy:
+      fail-fast: false
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: microsoft/playwright-github-action@v1
+      - 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 }}
@@ -3,7 +3,7 @@ name: "devrelease:docker"
 on:
  push:
    branches:
-      - main
+      - master
 jobs:
  publish-canary-docker:
    name: "publish to DockerHub"
@@ -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 }}
@@ -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
@@ -2,11 +2,11 @@ name: Build & Test
 on:
  push:
    branches:
-      - main
+      - master
      - release-*
  pull_request:
    branches:
-      - main
+      - master
      - release-*
 jobs:
  dev:
@@ -21,29 +21,30 @@ jobs:
    - uses: actions/checkout@v2
    - uses: microsoft/playwright-github-action@v1
    - 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
+      run: mvn test --no-transfer-progress
      env:
        BROWSER: ${{ matrix.browser }}
-    - name: Run tracing tests w/ sources
-      run: mvn test --no-transfer-progress --fail-at-end -D test=*TestTracing*
-      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
@@ -69,50 +70,22 @@ jobs:
        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: Build with Maven
+        run: mvn -B package -D skipTests --no-transfer-progress
      - name: Run tests
-        run: mvn test --no-transfer-progress --fail-at-end
+        run: mvn test --no-transfer-progress
        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: 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
@@ -2,15 +2,17 @@ name: Test CLI
 on:
  push:
    branches:
-      - main
+      - master
      - release-*
  pull_request:
    branches:
-      - main
+      - master
      - release-*
 jobs:
  verify:
    timeout-minutes: 30
+    strategy:
+      fail-fast: true
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v2
@@ -26,9 +28,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
@@ -3,18 +3,18 @@ on:
  push:
    paths:
      - '.github/workflows/test_docker.yml'
-      - '**/Dockerfile*'
+      - 'Dockerfile*'
    branches:
-      - main
+      - master
      - release-*
  pull_request:
    paths:
      - .github/workflows/test_docker.yml
-      - '**/Dockerfile*'
+      - Dockerfile.*
      - scripts/CLI_VERSION
      - '**/pom.xml'
    branches:
-      - main
+      - master
      - release-*
 jobs:
  test:
@@ -23,7 +23,7 @@ jobs:
    steps:
      - uses: actions/checkout@v2
      - name: Build Docker image
-        run: bash utils/docker/build.sh --amd64 focal playwright-java:localbuild-focal
+        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-focal /bin/bash)"
@@ -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 }}
@@ -2,14 +2,14 @@ name: Verify API
 on:
  push:
    branches:
-      - main
+      - master
      - release-*
    paths:
      - 'scripts/*'
      - 'api-generator/*'
  pull_request:
    branches:
-      - main
+      - master
      - release-*
    paths:
      - 'scripts/**'
@@ -17,20 +17,25 @@ on:
 jobs:
  verify:
    timeout-minutes: 30
+    strategy:
+      fail-fast: true
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v2
-      - uses: microsoft/playwright-github-action@v1
+      - 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
        run: scripts/generate_api.sh
-      - name: Update browser versions in README
-        run: scripts/update_readme.sh
      - name: Verify API is up to date
        run: |
          if [[ -n $(git status -s) ]]; then
-            echo "ERROR: generated interfaces/docs differ from the current sources:"
+            echo "ERROR: generated interfaces differ from the current sources:"
            git diff
            exit 1
          fi
@@ -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
@@ -33,10 +33,6 @@ Names of published driver archives can be found at https://github.com/microsoft/
 ```bash
 mvn compile
 mvn test
-# Executing a single test
-BROWSER=chromium mvn test -Dtest=TestPageNetworkSizes#shouldHaveTheCorrectResponseBodySize
-# Executing a single test class
-BROWSER=chromium mvn test -Dtest=TestPageNetworkSizes
 ```

 ### Generating API
@@ -49,19 +45,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)
@@ -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
@@ -11,9 +11,9 @@ Playwright is a Java library to automate [Chromium](https://www.chromium.org/Hom

 |          | Linux | macOS | Windows |
 |   :---   | :---: | :---: | :---:   |
-| Chromium <!-- GEN:chromium-version -->110.0.5481.38<!-- GEN:stop --> | :white_check_mark: | :white_check_mark: | :white_check_mark: |
-| WebKit <!-- GEN:webkit-version -->16.4<!-- GEN:stop --> | ✅ | ✅ | ✅ |
-| Firefox <!-- GEN:firefox-version -->108.0.2<!-- GEN:stop --> | :white_check_mark: | :white_check_mark: | :white_check_mark: |
+| Chromium <!-- GEN:chromium-version -->92.0.4498.0<!-- GEN:stop --> | :white_check_mark: | :white_check_mark: | :white_check_mark: |
+| WebKit <!-- GEN:webkit-version -->14.2<!-- GEN:stop --> | ✅ | ✅ | ✅ |
+| Firefox <!-- GEN:firefox-version -->89.0b6<!-- 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.10.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.
@@ -181,13 +173,13 @@ 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).

 ## Contributing

-Follow [the instructions](https://github.com/microsoft/playwright-java/blob/main/CONTRIBUTING.md#getting-code) to build the project from source and install the driver.
+Follow [the instructions](https://github.com/microsoft/playwright-java/blob/master/CONTRIBUTING.md#getting-code) to build the project from source and install the driver.

 ## Is Playwright for Java ready?

@@ -1,13 +0,0 @@
-# Rolling Playwright-Java to the latest Playwright driver
-
-* make sure to have at least Java 8 and Maven 3.6.3
-* clone playwright for java: http://github.com/microsoft/playwright-java
-* set new driver version in `scripts/CLI_VERSION`
-* regenerate API: `./scripts/download_driver_for_all_platforms.sh -f && ./scripts/generate_api.sh && ./scripts/update_readme.sh`
-* commit & send PR with the roll
-
-# Updating Version
-
-```bash
-./scripts/set_maven_version.sh 1.15.0
-```
@@ -6,13 +6,13 @@
  <parent>
    <groupId>com.microsoft.playwright</groupId>
    <artifactId>parent-pom</artifactId>
-    <version>1.30.0</version>
+    <version>1.11.0</version>
  </parent>

  <artifactId>driver-bundle</artifactId>
  <name>Playwright - Drivers For All Platforms</name>
  <description>
-    This module includes Playwright driver and related utilities for all supported platforms.
+    This module includes playwright-cli binary and related utilities for all supported platforms.
    It is intended to be used on the systems where Playwright driver is not preinstalled.
  </description>

@@ -28,10 +28,25 @@
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <source>8</source>
+          <failOnError>false</failOnError>
+        </configuration>
+        <executions>
+          <execution>
+            <id>attach-javadocs</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
      </plugin>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <redirectTestOutputToFile>true</redirectTestOutputToFile>
+        </configuration>
      </plugin>
    </plugins>
  </build>
@@ -14,80 +14,32 @@
 * 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;
 import java.net.URISyntaxException;
 import java.nio.file.*;
 import java.util.Collections;
-import java.util.Map;
 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());
-    }
    extractDriverToTempDir();
-    logMessage("extracted driver from jar to " + driverPath());
-    if (installBrowsers)
-      installBrowsers(env);
+    installBrowsers();
  }

-  private void installBrowsers(Map<String, String> env) throws IOException, InterruptedException {
-    String skip = env.get(PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD);
-    if (skip == null) {
-      skip = System.getenv(PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD);
-    }
-    if (skip != null && !"0".equals(skip) && !"false".equals(skip)) {
-      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();
+  private void installBrowsers() throws IOException, InterruptedException {
+    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.redirectError(ProcessBuilder.Redirect.INHERIT);
    pb.redirectOutput(ProcessBuilder.Redirect.INHERIT);
    Process p = pb.start();
@@ -106,25 +58,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 +72,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,17 +115,11 @@ 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";
+      return System.getProperty("os.arch").equals("amd64") ? "win32_x64" : "win32";
    }
    if (name.contains("linux")) {
-      if (arch.equals("aarch64")) {
-        return "linux-arm64";
-      } else {
-        return "linux";
-      }
+      return "linux";
    }
    if (name.contains("mac os x")) {
      return "mac";
@@ -200,7 +128,7 @@ public class DriverJar extends Driver {
  }

  @Override
-  protected Path driverDir() {
+  Path driverDir() {
    return driverTempDir;
  }
 }
@@ -0,0 +1,52 @@
+/*
+ * 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 com.microsoft.playwright.impl.StreamRedirectThread;
+import org.junit.jupiter.api.Test;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+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");
+    try {
+      Path cli = Driver.ensureDriverInstalled();
+      assertTrue(Files.exists(cli));
+
+      ProcessBuilder pb = new ProcessBuilder(cli.toString(), "install");
+      Process p = pb.start();
+      StreamRedirectThread stdoutThread = new StreamRedirectThread(p.getInputStream(), System.out);
+      StreamRedirectThread stderrThread = new StreamRedirectThread(p.getErrorStream(), System.err);
+      boolean result = p.waitFor(1, TimeUnit.MINUTES);
+      assertTrue(result, "Timed out waiting for browsers to install");
+      stderrThread.terminateAndJoin();
+      stdoutThread.terminateAndJoin();
+    } catch (Exception e) {
+      e.printStackTrace();
+      assertNull(e);
+    }
+  }
+}
@@ -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);
-  }
-}
@@ -6,13 +6,13 @@
  <parent>
    <groupId>com.microsoft.playwright</groupId>
    <artifactId>parent-pom</artifactId>
-    <version>1.30.0</version>
+    <version>1.11.0</version>
  </parent>

  <artifactId>driver</artifactId>
  <name>Playwright - Driver</name>
  <description>
-    This module provides API for discovery and launching of Playwright driver.
+    This module provides API for discovery and launching of playwright-cli binary.
  </description>

  <build>
@@ -24,10 +24,25 @@
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <source>8</source>
+          <failOnError>false</failOnError>
+        </configuration>
+        <executions>
+          <execution>
+            <id>attach-javadocs</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
      </plugin>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <redirectTestOutputToFile>true</redirectTestOutputToFile>
+        </configuration>
      </plugin>
    </plugins>
  </build>
@@ -0,0 +1,69 @@
+/*
+ * 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;
+
+/**
+ * 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
+    Path driverDir() {
+      return driverDir;
+    }
+  }
+
+  public static synchronized Path ensureDriverInstalled() {
+    if (instance == null) {
+      try {
+        instance = createDriver();
+      } catch (Exception exception) {
+        throw new RuntimeException("Failed to create driver", exception);
+      }
+    }
+    String name = instance.cliFileName();
+    return instance.driverDir().resolve(name);
+  }
+
+  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();
+}
@@ -0,0 +1,69 @@
+/*
+ * 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.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+// We manually copy stderr and stdout from child process as INHERIT for err/out streams
+// doesn't work well in Java Enterprise, see
+// https://github.com/microsoft/playwright-java/issues/418#issuecomment-832650650
+public class StreamRedirectThread extends Thread {
+  private final InputStream from;
+  private final OutputStream to;
+  private volatile boolean terminated;
+
+  public StreamRedirectThread(InputStream from, OutputStream to) {
+    this.from = from;
+    this.to = to;
+    start();
+  }
+
+  @Override
+  public void run() {
+    byte[] buffer = new byte[1<<14];
+    try {
+      while (true) {
+        while (from.available() != 0) {
+          int len = from.read(buffer);
+          if (len != -1) {
+            to.write(buffer);
+          }
+        }
+        if (terminated) {
+          break;
+        }
+        try {
+          Thread.sleep(100);
+        } catch (InterruptedException e) {
+        }
+      }
+    } catch (IOException e) {
+      e.printStackTrace(System.err);
+    }
+  }
+
+  public void terminateAndJoin() {
+    terminated = true;
+    try {
+      join();
+    } catch (InterruptedException e) {
+      e.printStackTrace(System.err);
+    }
+  }
+}
@@ -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);
-  }
-}
@@ -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);
-  }
-}
@@ -6,7 +6,7 @@

  <groupId>org.example</groupId>
  <artifactId>examples</artifactId>
-  <version>1.30.0</version>
+  <version>1.11.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.22.0</version>
+      <version>1.9.1-alpha-0</version>
    </dependency>
  </dependencies>
  <build>
@@ -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 startedInstallationGetting startedUsageGetting 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")));
-    }
-  }
-}
@@ -7,7 +7,7 @@
  <parent>
    <groupId>com.microsoft.playwright</groupId>
    <artifactId>parent-pom</artifactId>
-    <version>1.30.0</version>
+    <version>1.11.0</version>
  </parent>

  <artifactId>playwright</artifactId>
@@ -31,7 +31,17 @@
        <configuration>
          <subpackages>com.microsoft.playwright</subpackages>
          <excludePackageNames>com.microsoft.playwright.impl</excludePackageNames>
+          <additionalOptions>--allow-script-in-comments</additionalOptions>
+          <failOnError>false</failOnError>
        </configuration>
+        <executions>
+          <execution>
+            <id>attach-javadocs</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
      </plugin>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
@@ -40,25 +50,11 @@
      <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>
-        <executions>
-          <execution>
-            <goals>
-              <goal>test-jar</goal>
-            </goals>
-          </execution>
-        </executions>
+        <configuration>
+          <redirectTestOutputToFile>true</redirectTestOutputToFile>
+        </configuration>
      </plugin>
    </plugins>
-    <testResources>
-      <testResource>
-        <directory>src/test/resources</directory>
-        <targetPath>resources</targetPath>
-      </testResource>
-    </testResources>
  </build>
  <dependencies>
    <dependency>
@@ -73,10 +69,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>
@@ -1,192 +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.
-     */
-    public Map<String, String> extraHTTPHeaders;
-    /**
-     * Credentials for <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication">HTTP authentication</a>.
-     */
-    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.
-     */
-    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>.
-     */
-    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>.
-     */
-    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);
-}
-
@@ -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);
-}
-
@@ -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();
-}
-
@@ -29,15 +29,15 @@ import java.util.regex.Pattern;
 * <p> If a page opens another page, e.g. with a {@code window.open} call, the popup will belong to the parent page's browser
 * context.
 *
- * <p> Playwright allows creating "incognito" browser contexts with {@link Browser#newContext Browser.newContext()} method.
- * "Incognito" browser contexts don't write any browsing data to disk.
+ * <p> Playwright allows creation of "incognito" browser contexts with {@code browser.newContext()} method. "Incognito" browser
+ * contexts don't write any browsing data to disk.
 * <pre>{@code
 * // Create a new incognito browser context
 * BrowserContext context = browser.newContext();
 * // Create a new page inside context.
 * Page page = context.newPage();
 * page.navigate("https://example.com");
- * // Dispose context once it is no longer needed.
+ * // Dispose context once it"s no longer needed.
 * context.close();
 * }</pre>
 */
@@ -63,11 +63,11 @@ public interface BrowserContext extends AutoCloseable {
   * 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>
@@ -81,55 +81,6 @@ public interface BrowserContext extends AutoCloseable {
   */
  void offPage(Consumer<Page> handler);

-  /**
-   * Emitted when a request is issued from any pages created through this context. The [request] object is read-only. To only
-   * listen for requests from a particular page, use {@link Page#onRequest Page.onRequest()}.
-   *
-   * <p> In order to intercept and mutate requests, see {@link BrowserContext#route BrowserContext.route()} or {@link Page#route
-   * Page.route()}.
-   */
-  void onRequest(Consumer<Request> handler);
-  /**
-   * Removes handler that was previously added with {@link #onRequest onRequest(handler)}.
-   */
-  void offRequest(Consumer<Request> handler);
-
-  /**
-   * Emitted when a request fails, for example by timing out. To only listen for failed requests from a particular page, use
-   * {@link Page#onRequestFailed Page.onRequestFailed()}.
-   *
-   * <p> <strong>NOTE:</strong> HTTP Error responses, such as 404 or 503, are still successful responses from HTTP standpoint, so request will complete
-   * with {@link BrowserContext#onRequestFinished BrowserContext.onRequestFinished()} event and not with {@link
-   * BrowserContext#onRequestFailed BrowserContext.onRequestFailed()}.
-   */
-  void onRequestFailed(Consumer<Request> handler);
-  /**
-   * Removes handler that was previously added with {@link #onRequestFailed onRequestFailed(handler)}.
-   */
-  void offRequestFailed(Consumer<Request> handler);
-
-  /**
-   * 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()}.
-   */
-  void onRequestFinished(Consumer<Request> handler);
-  /**
-   * Removes handler that was previously added with {@link #onRequestFinished onRequestFinished(handler)}.
-   */
-  void offRequestFinished(Consumer<Request> handler);
-
-  /**
-   * 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()}.
-   */
-  void onResponse(Consumer<Response> handler);
-  /**
-   * Removes handler that was previously added with {@link #onResponse onResponse(handler)}.
-   */
-  void offResponse(Consumer<Response> handler);
-
  class ExposeBindingOptions {
    /**
     * Whether to pass the argument as a handle, instead of passing by value. When passing a handle, only one argument is
@@ -137,10 +88,6 @@ public interface BrowserContext extends AutoCloseable {
     */
    public Boolean handle;

-    /**
-     * Whether to pass the argument as a handle, instead of passing by value. When passing a handle, only one argument is
-     * supported. When passing by value, multiple arguments are supported.
-     */
    public ExposeBindingOptions setHandle(boolean handle) {
      this.handle = handle;
      return this;
@@ -152,86 +99,11 @@ public interface BrowserContext extends AutoCloseable {
     */
    public String origin;

-    /**
-     * The [origin] to grant permissions to, e.g. "https://example.com".
-     */
    public GrantPermissionsOptions setOrigin(String origin) {
      this.origin = origin;
      return this;
    }
  }
-  class RouteOptions {
-    /**
-     * How often a route should be used. By default it will be used every time.
-     */
-    public Integer times;
-
-    /**
-     * How often a route should be used. By default it will be used every time.
-     */
-    public RouteOptions setTimes(int times) {
-      this.times = times;
-      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;
-    /**
-     * 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;
-    }
-    /**
-     * 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
@@ -239,10 +111,6 @@ public interface BrowserContext extends AutoCloseable {
     */
    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;
@@ -254,22 +122,15 @@ public interface BrowserContext extends AutoCloseable {
     */
    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;

-    /**
-     * Receives the {@code Page} object and resolves to truthy value when the waiting should resolve.
-     */
    public WaitForPageOptions setPredicate(Predicate<Page> 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 WaitForPageOptions setTimeout(double timeout) {
      this.timeout = timeout;
      return this;
@@ -278,13 +139,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>
-   *
-   * @since v1.8
   */
  void addCookies(List<Cookie> cookies);
  /**
@@ -298,8 +155,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.
@@ -310,7 +165,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);
  /**
@@ -324,8 +178,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.
@@ -336,48 +188,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);
@@ -387,7 +226,6 @@ public interface BrowserContext extends AutoCloseable {
   * are returned.
   *
   * @param urls Optional list of URLs.
-   * @since v1.8
   */
  List<Cookie> cookies(String urls);
  /**
@@ -395,24 +233,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.*;
@@ -432,7 +267,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");
   *     }
   *   }
   * }
@@ -455,26 +290,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.*;
@@ -494,7 +326,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");
   *     }
   *   }
   * }
@@ -517,12 +349,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}.
   *
@@ -532,9 +363,7 @@ 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:
+   * <p> An example of adding an {@code md5} function to all pages in the context:
   * <pre>{@code
   * import com.microsoft.playwright.*;
   *
@@ -548,11 +377,11 @@ public interface BrowserContext extends AutoCloseable {
   *     try (Playwright playwright = Playwright.create()) {
   *       BrowserType webkit = playwright.webkit()
   *       Browser browser = webkit.launch(new BrowserType.LaunchOptions().setHeadless(false));
-   *       context.exposeFunction("sha256", args -> {
+   *       context.exposeFunction("sha1", args -> {
   *         String text = (String) args[0];
   *         MessageDigest crypto;
   *         try {
-   *           crypto = MessageDigest.getInstance("SHA-256");
+   *           crypto = MessageDigest.getInstance("SHA-1");
   *         } catch (NoSuchAlgorithmException e) {
   *           return null;
   *         }
@@ -562,12 +391,12 @@ public interface BrowserContext extends AutoCloseable {
   *       Page page = context.newPage();
   *       page.setContent("<script>\n" +
   *         "  async function onClick() {\n" +
-   *         "    document.querySelector('div').textContent = await window.sha256('PLAYWRIGHT');\n" +
+   *         "    document.querySelector('div').textContent = await window.sha1('PLAYWRIGHT');\n" +
   *         "  }\n" +
   *         "</script>\n" +
   *         "<button onclick=\"onClick()\">Click me</button>\n" +
   *         "<div></div>\n");
-   *       page.getByRole(AriaRole.BUTTON).click();
+   *       page.click("button");
   *     }
   *   }
   * }
@@ -575,7 +404,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);
  /**
@@ -588,6 +416,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>
@@ -600,7 +429,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);
@@ -615,6 +443,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>
@@ -627,37 +456,20 @@ 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
-   * 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**
-   *
   * <p> An example of a naive handler that aborts all image requests:
   * <pre>{@code
   * BrowserContext context = browser.newContext();
@@ -694,25 +506,14 @@ 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
-   * href="https://developer.mozilla.org/en-US/docs/Web/API/URL/URL">{@code new URL()}</a> constructor.
+   * @param url A glob pattern, regex pattern or predicate receiving [URL] to match while routing.
   * @param handler handler function to route the request.
-   * @since v1.8
   */
-  default void route(String url, Consumer<Route> handler) {
-    route(url, handler, null);
-  }
+  void route(String url, Consumer<Route> handler);
  /**
   * 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
-   * 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**
-   *
   * <p> An example of a naive handler that aborts all image requests:
   * <pre>{@code
   * BrowserContext context = browser.newContext();
@@ -749,23 +550,14 @@ 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
-   * href="https://developer.mozilla.org/en-US/docs/Web/API/URL/URL">{@code new URL()}</a> constructor.
+   * @param url A glob pattern, regex pattern or predicate receiving [URL] to match while routing.
   * @param handler handler function to route the request.
-   * @since v1.8
   */
-  void route(String url, Consumer<Route> handler, RouteOptions options);
+  void route(Pattern url, Consumer<Route> handler);
  /**
   * 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
-   * 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**
-   *
   * <p> An example of a naive handler that aborts all image requests:
   * <pre>{@code
   * BrowserContext context = browser.newContext();
@@ -802,210 +594,16 @@ 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
-   * href="https://developer.mozilla.org/en-US/docs/Web/API/URL/URL">{@code new URL()}</a> constructor.
+   * @param url A glob pattern, regex pattern or predicate receiving [URL] to match while routing.
   * @param handler handler function to route the request.
-   * @since v1.8
   */
-  default void route(Pattern url, Consumer<Route> handler) {
-    route(url, handler, null);
-  }
-  /**
-   * 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
-   * 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**
-   *
-   * <p> An example of a naive handler that aborts all image requests:
-   * <pre>{@code
-   * BrowserContext context = browser.newContext();
-   * context.route("**\/*.{png,jpg,jpeg}", route -> route.abort());
-   * Page page = context.newPage();
-   * page.navigate("https://example.com");
-   * browser.close();
-   * }</pre>
-   *
-   * <p> or the same snippet using a regex pattern instead:
-   * <pre>{@code
-   * BrowserContext context = browser.newContext();
-   * context.route(Pattern.compile("(\\.png$)|(\\.jpg$)"), route -> route.abort());
-   * Page page = context.newPage();
-   * page.navigate("https://example.com");
-   * browser.close();
-   * }</pre>
-   *
-   * <p> It is possible to examine the request to decide the route action. For example, mocking all requests that contain some
-   * post data, and leaving all other requests as is:
-   * <pre>{@code
-   * context.route("/api/**", route -> {
-   *   if (route.request().postData().contains("my-string"))
-   *     route.fulfill(new Route.FulfillOptions().setBody("mocked-data"));
-   *   else
-   *     route.resume();
-   * });
-   * }</pre>
-   *
-   * <p> Page routes (set up with {@link Page#route Page.route()}) take precedence over browser context routes when request
-   * matches both handlers.
-   *
-   * <p> To remove a route with its handler you can use {@link BrowserContext#unroute BrowserContext.unroute()}.
-   *
-   * <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
-   * 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
-   * 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**
-   *
-   * <p> An example of a naive handler that aborts all image requests:
-   * <pre>{@code
-   * BrowserContext context = browser.newContext();
-   * context.route("**\/*.{png,jpg,jpeg}", route -> route.abort());
-   * Page page = context.newPage();
-   * page.navigate("https://example.com");
-   * browser.close();
-   * }</pre>
-   *
-   * <p> or the same snippet using a regex pattern instead:
-   * <pre>{@code
-   * BrowserContext context = browser.newContext();
-   * context.route(Pattern.compile("(\\.png$)|(\\.jpg$)"), route -> route.abort());
-   * Page page = context.newPage();
-   * page.navigate("https://example.com");
-   * browser.close();
-   * }</pre>
-   *
-   * <p> It is possible to examine the request to decide the route action. For example, mocking all requests that contain some
-   * post data, and leaving all other requests as is:
-   * <pre>{@code
-   * context.route("/api/**", route -> {
-   *   if (route.request().postData().contains("my-string"))
-   *     route.fulfill(new Route.FulfillOptions().setBody("mocked-data"));
-   *   else
-   *     route.resume();
-   * });
-   * }</pre>
-   *
-   * <p> Page routes (set up with {@link Page#route Page.route()}) take precedence over browser context routes when request
-   * matches both handlers.
-   *
-   * <p> To remove a route with its handler you can use {@link BrowserContext#unroute BrowserContext.unroute()}.
-   *
-   * <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
-   * 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);
-  }
-  /**
-   * 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
-   * 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**
-   *
-   * <p> An example of a naive handler that aborts all image requests:
-   * <pre>{@code
-   * BrowserContext context = browser.newContext();
-   * context.route("**\/*.{png,jpg,jpeg}", route -> route.abort());
-   * Page page = context.newPage();
-   * page.navigate("https://example.com");
-   * browser.close();
-   * }</pre>
-   *
-   * <p> or the same snippet using a regex pattern instead:
-   * <pre>{@code
-   * BrowserContext context = browser.newContext();
-   * context.route(Pattern.compile("(\\.png$)|(\\.jpg$)"), route -> route.abort());
-   * Page page = context.newPage();
-   * page.navigate("https://example.com");
-   * browser.close();
-   * }</pre>
-   *
-   * <p> It is possible to examine the request to decide the route action. For example, mocking all requests that contain some
-   * post data, and leaving all other requests as is:
-   * <pre>{@code
-   * context.route("/api/**", route -> {
-   *   if (route.request().postData().contains("my-string"))
-   *     route.fulfill(new Route.FulfillOptions().setBody("mocked-data"));
-   *   else
-   *     route.resume();
-   * });
-   * }</pre>
-   *
-   * <p> Page routes (set up with {@link Page#route Page.route()}) take precedence over browser context routes when request
-   * matches both handlers.
-   *
-   * <p> To remove a route with its handler you can use {@link BrowserContext#unroute BrowserContext.unroute()}.
-   *
-   * <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
-   * 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);
+  void route(Predicate<String> url, Consumer<Route> handler);
  /**
   * This setting will change the default maximum navigation time for the following methods and related shortcuts:
   * <ul>
   * <li> {@link Page#goBack Page.goBack()}</li>
   * <li> {@link Page#goForward Page.goForward()}</li>
-   * <li> {@link Page#navigate Page.navigate()}</li>
+   * <li> {@link Page#goto Page.goto()}</li>
   * <li> {@link Page#reload Page.reload()}</li>
   * <li> {@link Page#setContent Page.setContent()}</li>
   * <li> {@link Page#waitForNavigation Page.waitForNavigation()}</li>
@@ -1016,7 +614,6 @@ public interface BrowserContext extends AutoCloseable {
   * BrowserContext.setDefaultNavigationTimeout()}.
   *
   * @param timeout Maximum navigation time in milliseconds
-   * @since v1.8
   */
  void setDefaultNavigationTimeout(double timeout);
  /**
@@ -1028,7 +625,6 @@ public interface BrowserContext extends AutoCloseable {
   * BrowserContext.setDefaultTimeout()}.
   *
   * @param timeout Maximum time in milliseconds
-   * @since v1.8
   */
  void setDefaultTimeout(double timeout);
  /**
@@ -1040,57 +636,40 @@ 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,
   * removes all routes for the {@code url}.
   *
   * @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);
@@ -1102,7 +681,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);
  /**
@@ -1111,7 +689,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);
@@ -1123,7 +700,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);
  /**
@@ -1132,7 +708,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);
@@ -1144,27 +719,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);
  /**
-   * 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
   */
  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);
 }
@@ -16,11 +16,10 @@

 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;
-import java.util.Collections;

 import static java.util.Arrays.asList;

@@ -29,12 +28,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();
+    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();
@@ -19,56 +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#onConsole Page.onConsole()} 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#onConsole Page.onConsole()}.
   */
  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 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();
 }
@@ -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,31 +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();
  /**
   * Returns dialog's type, can be one of {@code alert}, {@code beforeunload}, {@code confirm} or {@code prompt}.
-   *
-   * @since v1.8
   */
  String type();
 }
@@ -18,86 +18,68 @@ 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.
 *
- * <p> All the downloaded files belonging to the browser context are deleted when the browser context is closed.
+ * <p> All the downloaded files belonging to the browser context are deleted when the browser context is closed. All downloaded
+ * files are deleted when the browser closes.
 *
 * <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
-   */
-  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();
  /**
   * Returns path to the downloaded file in case of successful download. The method will wait for the download to finish if
   * necessary. The method throws when connected remotely.
-   *
-   * <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();
  /**
-   * Copy the download to a user-specified path. It is safe to call this method while the download is still in progress. Will
-   * wait for the download to finish if necessary.
+   * Saves the download to a user-specified path. It is safe to call this method while the download is still in progress.
   *
-   * @param path Path where the download should be copied.
-   * @since v1.8
+   * @param path Path where the download should be saved.
   */
  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();
 }
@@ -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,26 +36,16 @@ public interface FileChooser {
     */
    public Boolean noWaitAfter;
    /**
-     * 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.
+     * 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;

-    /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
-     */
    public SetFilesOptions setNoWaitAfter(boolean noWaitAfter) {
      this.noWaitAfter = noWaitAfter;
      return this;
    }
-    /**
-     * 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;
      return this;
@@ -62,84 +53,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);
 }
@@ -1,925 +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.regex.Pattern;
-
-/**
- * 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.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.
- * <pre>{@code
- * // Throws if there are several frames in DOM:
- * page.frame_locator(".result-frame").getByRole(AriaRole.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');
- * }</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 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 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
-   */
-  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 label.
-   *
-   * <p> **Usage**
-   *
-   * <p> For example, this method will find the input by label text "Password" in the following DOM:
-   * <pre>{@code
-   * 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 label.
-   *
-   * <p> **Usage**
-   *
-   * <p> For example, this method will find the input by label text "Password" in the following DOM:
-   * <pre>{@code
-   * 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 label.
-   *
-   * <p> **Usage**
-   *
-   * <p> For example, this method will find the input by label text "Password" in the following DOM:
-   * <pre>{@code
-   * 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 label.
-   *
-   * <p> **Usage**
-   *
-   * <p> For example, this method will find the input by label text "Password" in the following DOM:
-   * <pre>{@code
-   * 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.
-   *
-   * <p> <a href="https://playwright.dev/java/docs/locators">Learn more about locators</a>.
-   *
-   * @param selector A selector to use when resolving DOM element.
-   * @since v1.17
-   */
-  default Locator locator(String selector) {
-    return locator(selector, 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 selector A selector to use when resolving DOM element.
-   * @since v1.17
-   */
-  Locator locator(String selector, LocatorOptions options);
-  /**
-   * Returns locator to the n-th matching frame. It's zero based, {@code nth(0)} selects the first frame.
-   *
-   * @since v1.17
-   */
-  FrameLocator nth(int index);
-}
-
@@ -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,25 +108,22 @@ 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}"););
   * Map<String, JSHandle> properties = handle.getProperties();
@@ -141,15 +131,12 @@ public interface JSHandle {
   * 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();
 }
@@ -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.
@@ -60,9 +60,6 @@ public interface Keyboard {
     */
    public Double delay;

-    /**
-     * Time to wait between {@code keydown} and {@code keyup} in milliseconds. Defaults to 0.
-     */
    public PressOptions setDelay(double delay) {
      this.delay = delay;
      return this;
@@ -74,9 +71,6 @@ public interface Keyboard {
     */
    public Double delay;

-    /**
-     * Time to wait between key presses in milliseconds. Defaults to 0.
-     */
    public TypeOptions setDelay(double delay) {
      this.delay = delay;
      return this;
@@ -90,21 +84,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 +104,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 +123,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 +150,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 +160,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 +187,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 +205,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 +213,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 +225,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);
 }
@@ -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.
@@ -48,23 +49,14 @@ public interface Mouse {
     */
    public Double delay;

-    /**
-     * Defaults to {@code left}.
-     */
    public ClickOptions setButton(MouseButton button) {
      this.button = button;
      return this;
    }
-    /**
-     * defaults to 1. See [UIEvent.detail].
-     */
    public ClickOptions setClickCount(int clickCount) {
      this.clickCount = clickCount;
      return this;
    }
-    /**
-     * Time to wait between {@code mousedown} and {@code mouseup} in milliseconds. Defaults to 0.
-     */
    public ClickOptions setDelay(double delay) {
      this.delay = delay;
      return this;
@@ -80,16 +72,10 @@ public interface Mouse {
     */
    public Double delay;

-    /**
-     * Defaults to {@code left}.
-     */
    public DblclickOptions setButton(MouseButton button) {
      this.button = button;
      return this;
    }
-    /**
-     * Time to wait between {@code mousedown} and {@code mouseup} in milliseconds. Defaults to 0.
-     */
    public DblclickOptions setDelay(double delay) {
      this.delay = delay;
      return this;
@@ -105,16 +91,10 @@ public interface Mouse {
     */
    public Integer clickCount;

-    /**
-     * Defaults to {@code left}.
-     */
    public DownOptions setButton(MouseButton button) {
      this.button = button;
      return this;
    }
-    /**
-     * defaults to 1. See [UIEvent.detail].
-     */
    public DownOptions setClickCount(int clickCount) {
      this.clickCount = clickCount;
      return this;
@@ -122,13 +102,10 @@ 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.
-     */
    public MoveOptions setSteps(int steps) {
      this.steps = steps;
      return this;
@@ -144,16 +121,10 @@ public interface Mouse {
     */
    public Integer clickCount;

-    /**
-     * Defaults to {@code left}.
-     */
    public UpOptions setButton(MouseButton button) {
      this.button = button;
      return this;
    }
-    /**
-     * defaults to 1. See [UIEvent.detail].
-     */
    public UpOptions setClickCount(int clickCount) {
      this.clickCount = clickCount;
      return this;
@@ -161,23 +132,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,62 +150,37 @@ 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);
-  /**
-   * Dispatches a {@code wheel} event.
-   *
-   * <p> <strong>NOTE:</strong> Wheel events may cause scrolling if they are not handled, and this method does not wait for the scrolling to finish
-   * before returning.
-   *
-   * @param deltaX Pixels to scroll horizontally.
-   * @param deltaY Pixels to scroll vertically.
-   * @since v1.15
-   */
-  void wheel(double deltaX, double deltaY);
 }

@@ -40,57 +40,25 @@ import java.util.*;
 * }</pre>
 */
 public interface Playwright extends AutoCloseable {
-  class CreateOptions {
-    /**
-     * Additional environment variables that will be passed to the driver process. By default driver process inherits
-     * environment variables of the Playwright process.
-     */
-    public Map<String, String> env;
-
-    /**
-     * Additional environment variables that will be passed to the driver process. By default driver process inherits
-     * environment variables of the Playwright process.
-     */
-    public CreateOptions setEnv(Map<String, String> env) {
-      this.env = env;
-      return this;
-    }
-  }
  /**
   * 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();
  /**
@@ -103,15 +71,9 @@ public interface Playwright extends AutoCloseable {
   * page.navigate("https://www.w3.org/");
   * playwright.close();
   * }</pre>
-   *
-   * @since v1.10
   */
-  static Playwright create(CreateOptions options) {
-    return PlaywrightImpl.create(options);
-  }
-
  static Playwright create() {
-    return create(null);
+    return PlaywrightImpl.create();
  }
 }

@@ -28,98 +28,57 @@ 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
+   * An object with HTTP headers associated with the request. All header names are lower-case.
   */
  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
-   */
-  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 +91,31 @@ 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 +123,10 @@ public interface Request {
   * });
   * page.navigate("http://example.com");
   * }</pre>
-   *
-   * @since v1.8
   */
  Timing timing();
  /**
   * URL of the request.
-   *
-   * @since v1.8
   */
  String url();
 }
@@ -16,122 +16,50 @@

 package com.microsoft.playwright;

-import com.microsoft.playwright.options.*;
 import java.util.*;

 /**
 * {@code Response} class represents responses which are received by page.
 */
 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
+   * Waits for this response to finish, returns failure error if request failed.
   */
  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
+   * Returns the object with HTTP headers associated with the response. All header names are lower-case.
   */
  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
-   */
-  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.
-   *
-   * @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();
 }
@@ -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;
    /**
@@ -44,152 +43,27 @@ public interface Route {
     */
    public String url;

-    /**
-     * If set changes the request HTTP headers. Header values will be converted to a string.
-     */
    public ResumeOptions setHeaders(Map<String, String> headers) {
      this.headers = headers;
      return this;
    }
-    /**
-     * 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.
-     */
    public ResumeOptions setPostData(String postData) {
      this.postData = postData;
      return this;
    }
-    /**
-     * If set changes the post data of request.
-     */
    public ResumeOptions setPostData(byte[] postData) {
      this.postData = postData;
      return this;
    }
-    /**
-     * If set changes the request URL. New URL must have same protocol as original one.
-     */
    public ResumeOptions setUrl(String url) {
      this.url = url;
      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;
-    /**
-     * 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.
-     */
-    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;
-    }
-    /**
-     * 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;
-    }
-    /**
-     * 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.
@@ -208,67 +82,35 @@ 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}.
     */
    public Integer status;

-    /**
-     * Optional response body as text.
-     */
    public FulfillOptions setBody(String body) {
      this.body = body;
      return this;
    }
-    /**
-     * Optional response body as raw bytes.
-     */
    public FulfillOptions setBodyBytes(byte[] bodyBytes) {
      this.bodyBytes = bodyBytes;
      return this;
    }
-    /**
-     * If set, equals to setting {@code Content-Type} response header.
-     */
    public FulfillOptions setContentType(String contentType) {
      this.contentType = contentType;
      return this;
    }
-    /**
-     * Response headers. Header values will be converted to a string.
-     */
    public FulfillOptions setHeaders(Map<String, String> headers) {
      this.headers = headers;
      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.
-     */
    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}.
-     */
    public FulfillOptions setStatus(int status) {
      this.status = status;
      return this;
@@ -276,8 +118,6 @@ public interface Route {
  }
  /**
   * Aborts the route's request.
-   *
-   * @since v1.8
   */
  default void abort() {
    abort(null);
@@ -289,11 +129,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>
@@ -304,220 +144,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>
-   *
-   * @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>
-   *
-   * @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>
-   *
-   * @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>
-   *
-   * @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 -> {
@@ -531,10 +190,8 @@ public interface Route {
   * <p> An example of serving static file:
   * <pre>{@code
   * page.route("**\/xhr_endpoint", route -> route.fulfill(
-   *   new Route.FulfillOptions().setPath(Paths.get("mock_data.json"))));
+   *   new Route.FulfillOptions().setPath(Paths.get("mock_data.json")));
   * }</pre>
-   *
-   * @since v1.8
   */
  default void fulfill() {
    fulfill(null);
@@ -542,8 +199,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 -> {
@@ -557,16 +212,12 @@ public interface Route {
   * <p> An example of serving static file:
   * <pre>{@code
   * page.route("**\/xhr_endpoint", route -> route.fulfill(
-   *   new Route.FulfillOptions().setPath(Paths.get("mock_data.json"))));
+   *   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();
 }
@@ -17,36 +17,30 @@
 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.
-     */
    public RegisterOptions setContentScript(boolean contentScript) {
      this.contentScript = contentScript;
      return this;
    }
  }
  /**
-   * **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" +
@@ -63,28 +57,25 @@ public interface Selectors {
   * Page page = browser.newPage();
   * page.setContent("<div><button>Click me</button></div>");
   * // Use the selector prefixed with its name.
-   * Locator button = page.locator("tag=button");
+   * ElementHandle button = page.querySelector("tag=button");
   * // Combine it with other selector engines.
-   * page.locator("tag=div >> text=\"Click me\"").click();
+   * page.click("tag=div >> text=\"Click me\"");
   * // Can use it in any methods supporting selectors.
-   * int buttonCount = (int) page.locator("tag=button").count();
+   * int buttonCount = (int) page.evalOnSelectorAll("tag=button", "buttons => buttons.length");
   * 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);
  }
  /**
-   * **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" +
@@ -101,26 +92,23 @@ public interface Selectors {
   * Page page = browser.newPage();
   * page.setContent("<div><button>Click me</button></div>");
   * // Use the selector prefixed with its name.
-   * Locator button = page.locator("tag=button");
+   * ElementHandle button = page.querySelector("tag=button");
   * // Combine it with other selector engines.
-   * page.locator("tag=div >> text=\"Click me\"").click();
+   * page.click("tag=div >> text=\"Click me\"");
   * // Can use it in any methods supporting selectors.
-   * int buttonCount = (int) page.locator("tag=button").count();
+   * int buttonCount = (int) page.evalOnSelectorAll("tag=button", "buttons => buttons.length");
   * 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);
  /**
-   * **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" +
@@ -137,28 +125,25 @@ public interface Selectors {
   * Page page = browser.newPage();
   * page.setContent("<div><button>Click me</button></div>");
   * // Use the selector prefixed with its name.
-   * Locator button = page.locator("tag=button");
+   * ElementHandle button = page.querySelector("tag=button");
   * // Combine it with other selector engines.
-   * page.locator("tag=div >> text=\"Click me\"").click();
+   * page.click("tag=div >> text=\"Click me\"");
   * // Can use it in any methods supporting selectors.
-   * int buttonCount = (int) page.locator("tag=button").count();
+   * int buttonCount = (int) page.evalOnSelectorAll("tag=button", "buttons => buttons.length");
   * 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);
  }
  /**
-   * **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" +
@@ -175,27 +160,18 @@ public interface Selectors {
   * Page page = browser.newPage();
   * page.setContent("<div><button>Click me</button></div>");
   * // Use the selector prefixed with its name.
-   * Locator button = page.locator("tag=button");
+   * ElementHandle button = page.querySelector("tag=button");
   * // Combine it with other selector engines.
-   * page.locator("tag=div >> text=\"Click me\"").click();
+   * page.click("tag=div >> text=\"Click me\"");
   * // Can use it in any methods supporting selectors.
-   * int buttonCount = (int) page.locator("tag=button").count();
+   * int buttonCount = (int) page.evalOnSelectorAll("tag=button", "buttons => buttons.length");
   * 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);
 }

@@ -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,8 +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}).
-   *
-   * @since v1.8
   */
  void tap(double x, double y);
 }
@@ -1,280 +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 java.nio.file.Path;
-
-/**
- * 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.
- *
- * <p> Start recording a trace before performing actions. At the end, stop tracing and save it to a file.
- * <pre>{@code
- * Browser browser = chromium.launch();
- * BrowserContext context = browser.newContext();
- * context.tracing().start(new Tracing.StartOptions()
- *   .setScreenshots(true)
- *   .setSnapshots(true));
- * Page page = context.newPage();
- * page.navigate("https://playwright.dev");
- * context.tracing().stop(new Tracing.StopOptions()
- *   .setPath(Paths.get("trace.zip")));
- * }</pre>
- */
-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()}.
-     */
-    public String name;
-    /**
-     * Whether to capture screenshots during tracing. Screenshots are used to build a timeline preview.
-     */
-    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>
-     */
-    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()}.
-     */
-    public StartOptions setName(String name) {
-      this.name = name;
-      return this;
-    }
-    /**
-     * Whether to capture screenshots during tracing. Screenshots are used to build a timeline preview.
-     */
-    public StartOptions setScreenshots(boolean screenshots) {
-      this.screenshots = screenshots;
-      return this;
-    }
-    /**
-     * If this option is true tracing will
-     * <ul>
-     * <li> capture DOM snapshot on every action</li>
-     * <li> record network activity</li>
-     * </ul>
-     */
-    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.
-     */
-    public StartOptions setTitle(String title) {
-      this.title = title;
-      return this;
-    }
-  }
-  class StartChunkOptions {
-    /**
-     * Trace name to be shown in the Trace Viewer.
-     */
-    public String title;
-
-    /**
-     * Trace name to be shown in the Trace Viewer.
-     */
-    public StartChunkOptions setTitle(String title) {
-      this.title = title;
-      return this;
-    }
-  }
-  class StopOptions {
-    /**
-     * Export trace into the file with the given path.
-     */
-    public Path path;
-
-    /**
-     * Export trace into the file with the given path.
-     */
-    public StopOptions setPath(Path path) {
-      this.path = path;
-      return this;
-    }
-  }
-  class StopChunkOptions {
-    /**
-     * Export trace collected since the last {@link Tracing#startChunk Tracing.startChunk()} call into the file with the given
-     * path.
-     */
-    public Path path;
-
-    /**
-     * Export trace collected since the last {@link Tracing#startChunk Tracing.startChunk()} call into the file with the given
-     * path.
-     */
-    public StopChunkOptions setPath(Path path) {
-      this.path = path;
-      return this;
-    }
-  }
-  /**
-   * Start tracing.
-   *
-   * <p> **Usage**
-   * <pre>{@code
-   * context.tracing().start(new Tracing.StartOptions()
-   *   .setScreenshots(true)
-   *   .setSnapshots(true));
-   * Page page = context.newPage();
-   * page.navigate("https://playwright.dev");
-   * 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)
-   *   .setSnapshots(true));
-   * Page page = context.newPage();
-   * page.navigate("https://playwright.dev");
-   * 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**
-   * <pre>{@code
-   * context.tracing().start(new Tracing.StartOptions()
-   *   .setScreenshots(true)
-   *   .setSnapshots(true));
-   * Page page = context.newPage();
-   * page.navigate("https://playwright.dev");
-   *
-   * context.tracing().startChunk();
-   * page.getByText("Get Started").click();
-   * // Everything between startChunk and stopChunk will be recorded in the trace.
-   * context.tracing().stopChunk(new Tracing.StopChunkOptions()
-   *   .setPath(Paths.get("trace1.zip")));
-   *
-   * context.tracing().startChunk();
-   * page.navigate("http://example.com");
-   * // Save a second trace file with different actions.
-   * 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**
-   * <pre>{@code
-   * context.tracing().start(new Tracing.StartOptions()
-   *   .setScreenshots(true)
-   *   .setSnapshots(true));
-   * Page page = context.newPage();
-   * page.navigate("https://playwright.dev");
-   *
-   * context.tracing().startChunk();
-   * page.getByText("Get Started").click();
-   * // Everything between startChunk and stopChunk will be recorded in the trace.
-   * context.tracing().stopChunk(new Tracing.StopChunkOptions()
-   *   .setPath(Paths.get("trace1.zip")));
-   *
-   * context.tracing().startChunk();
-   * page.navigate("http://example.com");
-   * // Save a second trace file with different actions.
-   * 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);
-}
-
@@ -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);
 }
@@ -16,6 +16,7 @@

 package com.microsoft.playwright;

+import java.util.*;
 import java.util.function.Consumer;
 import java.util.function.Predicate;

@@ -66,22 +67,15 @@ 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;

-    /**
-     * Receives the {@code WebSocketFrame} object and resolves to truthy value when the waiting should resolve.
-     */
    public WaitForFrameReceivedOptions setPredicate(Predicate<WebSocketFrame> 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 WaitForFrameReceivedOptions setTimeout(double timeout) {
      this.timeout = timeout;
      return this;
@@ -93,22 +87,15 @@ 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;

-    /**
-     * Receives the {@code WebSocketFrame} object and resolves to truthy value when the waiting should resolve.
-     */
    public WaitForFrameSentOptions setPredicate(Predicate<WebSocketFrame> 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 WaitForFrameSentOptions setTimeout(double timeout) {
      this.timeout = timeout;
      return this;
@@ -116,54 +103,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);
 }
@@ -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();
 }
@@ -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,15 +47,11 @@ 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()}.
-     */
    public WaitForCloseOptions setTimeout(double timeout) {
      this.timeout = timeout;
      return this;
@@ -68,12 +65,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 +82,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 +100,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 +116,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 +134,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);
 }
@@ -1,62 +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. A new instance of {@code APIResponseAssertions} is created by calling {@link
- * PlaywrightAssertions#assertThat PlaywrightAssertions.assertThat()}:
- * <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();
-}
-
@@ -1,184 +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;
-
-import java.util.regex.Pattern;
-
-/**
- * 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 PageAssertions} is created by calling {@link
- * PlaywrightAssertions#assertThat PlaywrightAssertions.assertThat()}:
- * <pre>{@code
- * ...
- * import static com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat;
- *
- * public class TestPage {
- *   ...
- *   @Test
- *   void navigatesToLoginPage() {
- *     ...
- *     page.getByText("Sign in").click();
- *     assertThat(page).hasURL(Pattern.compile(".*\/login"));
- *   }
- * }
- * }</pre>
- */
-public interface PageAssertions {
-  class HasTitleOptions {
-    /**
-     * Time to retry the assertion for.
-     */
-    public Double timeout;
-
-    /**
-     * Time to retry the assertion for.
-     */
-    public HasTitleOptions setTimeout(double timeout) {
-      this.timeout = timeout;
-      return this;
-    }
-  }
-  class HasURLOptions {
-    /**
-     * Time to retry the assertion for.
-     */
-    public Double timeout;
-
-    /**
-     * 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
-   */
-  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
-   */
-  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
-   */
-  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
-   */
-  void hasURL(Pattern urlOrRegExp, HasURLOptions options);
-}
-
@@ -1,115 +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;
-
-import com.microsoft.playwright.APIResponse;
-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.
- *
- * <p> Consider the following example:
- * <pre>{@code
- * ...
- * import static com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat;
- *
- * public class TestExample {
- *   ...
- *   @Test
- *   void statusBecomesSubmitted() {
- *     ...
- *     page.locator("#submit-button").click();
- *     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> By default, the timeout for assertions is set to 5 seconds.
- */
-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);
-  }
-
-  /**
-   * 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);
-  }
-
-}
-
@@ -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 = (RequestOptionsImpl) options;
-    if (impl == null) {
-      impl = new RequestOptionsImpl();
-    }
-    if (impl.method == null) {
-      impl.method = method;
-    }
-    return impl;
-  }
-}
@@ -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;
-  }
-}
@@ -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);
-  }
-}
@@ -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());
-  }
-
-}
@@ -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);
  }
@@ -39,10 +40,6 @@ class ArtifactImpl extends ChannelOwner {
    return stream.stream();
  }

-  public void cancel() {
-    sendMessage("cancel");
-  }
-
  public void delete() {
    sendMessage("delete");
  }
@@ -56,7 +53,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 +61,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);
@@ -1,94 +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.PlaywrightException;
-import org.opentest4j.AssertionFailedError;
-import org.opentest4j.ValueWrapper;
-
-import java.util.Collection;
-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 {
-  final LocatorImpl actualLocator;
-  final boolean isNot;
-
-  AssertionsBase(LocatorImpl actual, boolean isNot) {
-    this.actualLocator = actual;
-    this.isNot = isNot;
-  }
-
-  void expectImpl(String expression, ExpectedTextValue textValue, Object expected, String message, FrameExpectOptions options) {
-    expectImpl(expression, asList(textValue), expected, message, options);
-  }
-
-  void expectImpl(String expression, List<ExpectedTextValue> expectedText, Object expected, String message, FrameExpectOptions options) {
-    if (options == null) {
-      options = new FrameExpectOptions();
-    }
-    options.expectedText = expectedText;
-    options.isNot = isNot;
-    expectImpl(expression, options, expected, message);
-  }
-
-  void expectImpl(String expression, FrameExpectOptions expectOptions, Object expected, String message) {
-    if (expectOptions.timeout == null) {
-      expectOptions.timeout = AssertionsTimeout.defaultTimeout;
-    }
-    if (expectOptions.isNot) {
-      message = message.replace("expected to", "expected not to");
-    }
-    FrameExpectResult result = actualLocator.expect(expression, expectOptions);
-    if (result.matches == isNot) {
-      Object actual = result.received == null ? null : Serialization.deserialize(result.received);
-      String log = String.join("\n", result.log);
-      if (!log.isEmpty()) {
-        log = "\nCall log:\n" + log;
-      }
-      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);
-    }
-  }
-
-  private static ValueWrapper formatValue(Object value) {
-    if (value == null || !value.getClass().isArray()) {
-      return ValueWrapper.create(value);
-    }
-    Collection<String> values = asList((Object[]) value).stream().map(e -> e.toString()).collect(Collectors.toList());
-    String stringRepresentation = "[" + String.join(", ", values) + "]";
-    return ValueWrapper.create(value, stringRepresentation);
-  }
-
-  static ExpectedTextValue expectedRegex(Pattern pattern) {
-    ExpectedTextValue expected = new ExpectedTextValue();
-    expected.regexSource = pattern.pattern();
-    if (pattern.flags() != 0) {
-      expected.regexFlags = toJsRegexFlags(pattern);
-    }
-    return expected;
-  }
-}
@@ -1,30 +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.PlaywrightException;
-
-public class AssertionsTimeout {
-  static double defaultTimeout = 5_000;
-
-  public static void setDefaultTimeout(double ms) {
-    if (ms < 0) {
-      throw new PlaywrightException("Timeout cannot be negative");
-    }
-    defaultTimeout = ms;
-  }
-}
@@ -19,21 +19,26 @@ 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.*;
+import com.microsoft.playwright.BrowserContext;
+import com.microsoft.playwright.Page;
+import com.microsoft.playwright.PlaywrightException;
+import com.microsoft.playwright.Route;
+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.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;
@@ -42,44 +47,18 @@ 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 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.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;
-    }
-  }

  enum EventType {
    CLOSE,
    PAGE,
-    REQUEST,
-    REQUESTFAILED,
-    REQUESTFINISHED,
-    RESPONSE,
  }

  BrowserContextImpl(ChannelOwner parent, String type, String guid, JsonObject initializer) {
@@ -89,22 +68,6 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
    } else {
      browser = null;
    }
-    this.tracing = connection.getExistingObject(initializer.getAsJsonObject("tracing").get("guid").getAsString());
-    this.request = connection.getExistingObject(initializer.getAsJsonObject("requestContext").get("guid").getAsString());
-  }
-
-  void setRecordHar(Path path, HarContentPolicy policy) {
-    if (path != null) {
-      harRecorders.put("", new HarRecorder(path, policy));
-    }
-  }
-
-  void setBaseUrl(String spec) {
-    try {
-      this.baseUrl = new URL(spec);
-    } catch (MalformedURLException e) {
-      this.baseUrl = null;
-    }
  }

  @Override
@@ -127,49 +90,9 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
    listeners.remove(EventType.PAGE, handler);
  }

-  @Override
-  public void onRequest(Consumer<Request> handler) {
-    listeners.add(EventType.REQUEST, handler);
-  }
-
-  @Override
-  public void offRequest(Consumer<Request> handler) {
-    listeners.remove(EventType.REQUEST, handler);
-  }
-
-  @Override
-  public void onRequestFailed(Consumer<Request> handler) {
-    listeners.add(EventType.REQUESTFAILED, handler);
-  }
-
-  @Override
-  public void offRequestFailed(Consumer<Request> handler) {
-    listeners.remove(EventType.REQUESTFAILED, handler);
-  }
-
-  @Override
-  public void onRequestFinished(Consumer<Request> handler) {
-    listeners.add(EventType.REQUESTFINISHED, handler);
-  }
-
-  @Override
-  public void offRequestFinished(Consumer<Request> handler) {
-    listeners.remove(EventType.REQUESTFINISHED, handler);
-  }
-
-  @Override
-  public void onResponse(Consumer<Response> handler) {
-    listeners.add(EventType.RESPONSE, handler);
-  }
-
-  @Override
-  public void offResponse(Consumer<Response> handler) {
-    listeners.remove(EventType.RESPONSE, handler);
-  }
-
-  private <T> T waitForEventWithTimeout(EventType eventType, Runnable code, Predicate<T> predicate, Double timeout) {
+  private <T> T waitForEventWithTimeout(EventType eventType, Runnable code, Double timeout) {
    List<Waitable<T>> waitables = new ArrayList<>();
-    waitables.add(new WaitableEvent<>(listeners, eventType, predicate));
+    waitables.add(new WaitableEvent<>(listeners, eventType));
    waitables.add(new WaitableContextClose<>());
    waitables.add(timeoutSettings.createWaitable(timeout));
    return runUntil(code, new WaitableRace<>(waitables));
@@ -177,14 +100,14 @@ 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) {
    if (options == null) {
      options = new WaitForPageOptions();
    }
-    return waitForEventWithTimeout(EventType.PAGE, code, options.predicate, options.timeout);
+    return waitForEventWithTimeout(EventType.PAGE, code, options.timeout);
  }

  @Override
@@ -194,7 +117,7 @@ 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() {
@@ -203,28 +126,6 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
    }
    isClosedOrClosing = true;
    try {
-      for (Map.Entry<String, HarRecorder> entry : harRecorders.entrySet()) {
-        JsonObject params = new JsonObject();
-        params.addProperty("harId", entry.getKey());
-        JsonObject json = sendMessage("harExport", params).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);
-        }
-        artifact.delete();
-      }
-
      sendMessage("close");
    } catch (PlaywrightException e) {
      if (!isSafeCloseError(e)) {
@@ -362,43 +263,23 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
  }

  @Override
-  public APIRequestContextImpl request() {
-    return request;
+  public void route(String url, Consumer<Route> handler) {
+    route(new UrlMatcher(url), handler);
  }

  @Override
-  public void route(String url, Consumer<Route> handler, RouteOptions options) {
-    route(new UrlMatcher(baseUrl, url), handler, options);
+  public void route(Pattern url, Consumer<Route> handler) {
+    route(new UrlMatcher(url), handler);
  }

  @Override
-  public void route(Pattern url, Consumer<Route> handler, RouteOptions options) {
-    route(new UrlMatcher(url), handler, options);
+  public void route(Predicate<String> url, Consumer<Route> handler) {
+    route(new UrlMatcher(url), handler);
  }

-  @Override
-  public void route(Predicate<String> url, Consumer<Route> handler, RouteOptions options) {
-    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) {
+  private void route(UrlMatcher matcher, Consumer<Route> handler) {
    withLogging("BrowserContext.route", () -> {
-      routes.add(matcher, handler, options == null ? null : options.times);
+      routes.add(matcher, handler);
      if (routes.size() == 1) {
        JsonObject params = new JsonObject();
        params.addProperty("enabled", true);
@@ -407,22 +288,6 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
    });
  }

-  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", HarContentPolicy.ATTACH.name().toLowerCase());
-    jsonOptions.addProperty("mode", HarMode.MINIMAL.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) {
    withLogging("BrowserContext.setDefaultNavigationTimeout", () -> {
@@ -491,14 +356,9 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
    });
  }

-  @Override
-  public TracingImpl tracing() {
-    return tracing;
-  }
-
  @Override
  public void unroute(String url, Consumer<Route> handler) {
-    unroute(new UrlMatcher(this.baseUrl, url), handler);
+    unroute(new UrlMatcher(url), handler);
  }

  @Override
@@ -525,37 +385,26 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
  private void unroute(UrlMatcher matcher, Consumer<Route> handler) {
    withLogging("BrowserContext.unroute", () -> {
      routes.remove(matcher, handler);
-      maybeDisableNetworkInterception();
+      if (routes.size() == 0) {
+        JsonObject params = new JsonObject();
+        params.addProperty("enabled", false);
+        sendMessage("setNetworkInterceptionEnabled", params);
+      }
    });
  }

-  private void maybeDisableNetworkInterception() {
-    if (routes.size() == 0) {
-      JsonObject params = new JsonObject();
-      params.addProperty("enabled", false);
-      sendMessage("setNetworkInterceptionEnabled", params);
-    }
-  }
-
-  void handleRoute(RouteImpl route) {
-    Router.HandleResult handled = routes.handle(route);
-    if (handled != Router.HandleResult.NoMatchingHandler) {
-      maybeDisableNetworkInterception();
-    }
-    if (handled == Router.HandleResult.NoMatchingHandler || handled == Router.HandleResult.Fallback) {
-      route.resume();
-    }
-  }
-
-  WaitableResult<JsonElement> pause() {
-    return sendMessageAsync("pause", new JsonObject());
+  void pause() {
+    sendMessage("pause");
  }

  @Override
  protected void handleEvent(String event, JsonObject params) {
    if ("route".equals(event)) {
-      RouteImpl route = connection.getExistingObject(params.getAsJsonObject("route").get("guid").getAsString());
-      handleRoute(route);
+      Route route = connection.getExistingObject(params.getAsJsonObject("route").get("guid").getAsString());
+      boolean handled = routes.handle(route);
+      if (!handled) {
+        route.resume();
+      }
    } else if ("page".equals(event)) {
      PageImpl page = connection.getExistingObject(params.getAsJsonObject("page").get("guid").getAsString());
      pages.add(page);
@@ -569,49 +418,6 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
      if (binding != null) {
        bindingCall.call(binding);
      }
-    } else if ("request".equals(event)) {
-      String guid = params.getAsJsonObject("request").get("guid").getAsString();
-      RequestImpl request = connection.getExistingObject(guid);
-      listeners.notify(EventType.REQUEST, request);
-      if (params.has("page")) {
-        PageImpl page = connection.getExistingObject(params.getAsJsonObject("page").get("guid").getAsString());
-        page.listeners.notify(PageImpl.EventType.REQUEST, request);
-      }
-    } else if ("requestFailed".equals(event)) {
-      String guid = params.getAsJsonObject("request").get("guid").getAsString();
-      RequestImpl request = connection.getExistingObject(guid);
-      request.didFailOrFinish = true;
-      if (params.has("failureText")) {
-        request.failure = params.get("failureText").getAsString();
-      }
-      if (request.timing != null) {
-        request.timing.responseEnd = params.get("responseEndTiming").getAsDouble();
-      }
-      listeners.notify(EventType.REQUESTFAILED, request);
-      if (params.has("page")) {
-        PageImpl page = connection.getExistingObject(params.getAsJsonObject("page").get("guid").getAsString());
-        page.listeners.notify(PageImpl.EventType.REQUESTFAILED, request);
-      }
-    } else if ("requestFinished".equals(event)) {
-      String guid = params.getAsJsonObject("request").get("guid").getAsString();
-      RequestImpl request = connection.getExistingObject(guid);
-      request.didFailOrFinish = true;
-      if (request.timing != null) {
-        request.timing.responseEnd = params.get("responseEndTiming").getAsDouble();
-      }
-      listeners.notify(EventType.REQUESTFINISHED, request);
-      if (params.has("page")) {
-        PageImpl page = connection.getExistingObject(params.getAsJsonObject("page").get("guid").getAsString());
-        page.listeners.notify(PageImpl.EventType.REQUESTFINISHED, request);
-      }
-    } else if ("response".equals(event)) {
-      String guid = params.getAsJsonObject("response").get("guid").getAsString();
-      Response response = connection.getExistingObject(guid);
-      listeners.notify(EventType.RESPONSE, response);
-      if (params.has("page")) {
-        PageImpl page = connection.getExistingObject(params.getAsJsonObject("page").get("guid").getAsString());
-        page.listeners.notify(PageImpl.EventType.RESPONSE, response);
-      }
    } else if ("close".equals(event)) {
      didClose();
    }
@@ -624,11 +430,4 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
    }
    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());
-  }
 }
@@ -19,28 +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;

  enum EventType {
    DISCONNECTED,
@@ -60,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());
@@ -77,6 +71,7 @@ class BrowserImpl extends ChannelOwner implements Browser {
      } catch (IOException e) {
        throw new PlaywrightException("Failed to close browser connection", e);
      }
+      notifyRemoteClosed();
      return;
    }
    try {
@@ -117,9 +112,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 {
@@ -135,50 +127,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();
@@ -202,13 +165,12 @@ class BrowserImpl extends ChannelOwner implements Browser {
        params.addProperty("noDefaultViewport", true);
      }
    }
+    params.addProperty("sdkLanguage", "java");
    JsonElement result = sendMessage("newContext", params);
    BrowserContextImpl context = connection.getExistingObject(result.getAsJsonObject().getAsJsonObject("context").get("guid").getAsString());
-    context.videosDir = options.recordVideoDir;
-    if (options.baseURL != null) {
-      context.setBaseUrl(options.baseURL);
+    if (options.recordVideoDir != null) {
+      context.videosDir = options.recordVideoDir;
    }
-    context.setRecordHar(recordHarPath, harContentPolicy);
    contexts.add(context);
    return context;
  }
@@ -229,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);
  }
@@ -245,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;
@@ -16,25 +16,24 @@

 package com.microsoft.playwright.impl;

-import com.google.gson.Gson;
 import com.google.gson.JsonElement;
 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.net.URI;
+import java.net.URISyntaxException;
 import java.nio.file.Path;
+import java.time.Duration;
+import java.util.Collections;
+import java.util.Map;
 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,9 +49,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;
-    return browser;
+    return connection.getExistingObject(result.getAsJsonObject().getAsJsonObject("browser").get("guid").getAsString());
  }

  @Override
@@ -61,56 +58,47 @@ class BrowserTypeImpl extends ChannelOwner implements BrowserType {
  }

  private Browser connectImpl(String wsEndpoint, ConnectOptions options) {
-    if (options == null) {
-      options = new ConnectOptions();
-    }
-    // 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;
+    try {
+      Duration timeout = Duration.ofDays(1);
+      Map<String, String> headers = Collections.emptyMap();
+      if (options != null) {
+        if (options.timeout != null) {
+          timeout = Duration.ofMillis(Math.round(options.timeout));
+        }
+        if (options.headers != null) {
+          headers = options.headers;
+        }
      }
-    }
-    if (!foundBrowserHeader) {
-      headers.addProperty("x-playwright-browser", name());
-    }
-
-    JsonObject json = connection.localUtils().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);
-    PlaywrightImpl playwright = connection.initializePlaywright();
-    if (!playwright.initializer.has("preLaunchedBrowser")) {
-      try {
-        connection.close();
-      } catch (IOException e) {
-        e.printStackTrace(System.err);
+      WebSocketTransport transport = new WebSocketTransport(new URI(wsEndpoint), headers, timeout);
+      Connection connection = new Connection(transport);
+      PlaywrightImpl playwright = (PlaywrightImpl) connection.waitForObjectWithKnownName("Playwright");
+      if (!playwright.initializer.has("preLaunchedBrowser")) {
+        try {
+          connection.close();
+        } catch (IOException e) {
+          e.printStackTrace(System.err);
+        }
+        throw new PlaywrightException("Malformed endpoint. Did you use launchServer method?");
      }
-      throw new PlaywrightException("Malformed endpoint. Did you use launchServer method?");
+      playwright.initSharedSelectors(this.connection.getExistingObject("Playwright"));
+      BrowserImpl browser = connection.getExistingObject(playwright.initializer.getAsJsonObject("preLaunchedBrowser").get("guid").getAsString());
+      browser.isRemote = true;
+      browser.isConnectedOverWebSocket = true;
+      Consumer<WebSocketTransport> connectionCloseListener = t -> browser.notifyRemoteClosed();
+      transport.onClose(connectionCloseListener);
+      browser.onDisconnected(b -> {
+        playwright.unregisterSelectors();
+        transport.offClose(connectionCloseListener);
+        try {
+          connection.close();
+        } catch (IOException e) {
+          e.printStackTrace(System.err);
+        }
+      });
+      return browser;
+    } catch (URISyntaxException e) {
+      throw new PlaywrightException("Failed to connect", e);
    }
-    playwright.initSharedSelectors(this.connection.getExistingObject("Playwright"));
-    BrowserImpl browser = connection.getExistingObject(playwright.initializer.getAsJsonObject("preLaunchedBrowser").get("guid").getAsString());
-    browser.isConnectedOverWebSocket = true;
-    browser.browserType = this;
-    Consumer<JsonPipe> connectionCloseListener = t -> browser.notifyRemoteClosed();
-    pipe.onClose(connectionCloseListener);
-    browser.onDisconnected(b -> {
-      playwright.unregisterSelectors();
-      pipe.offClose(connectionCloseListener);
-      try {
-        connection.close();
-      } catch (IOException e) {
-        e.printStackTrace(System.err);
-      }
-    });
-    return browser;
  }

  @Override
@@ -127,11 +115,12 @@ class BrowserTypeImpl extends ChannelOwner implements BrowserType {
    }

    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
+    params.addProperty("sdkLanguage", "java");
    params.addProperty("endpointURL", endpointURL);
    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);
@@ -153,52 +142,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();
@@ -222,13 +179,12 @@ class BrowserTypeImpl extends ChannelOwner implements BrowserType {
        params.addProperty("noDefaultViewport", true);
      }
    }
+    params.addProperty("sdkLanguage", "java");
    JsonObject json = sendMessage("launchPersistentContext", params).getAsJsonObject();
    BrowserContextImpl context = connection.getExistingObject(json.getAsJsonObject("context").get("guid").getAsString());
-    context.videosDir = options.recordVideoDir;
-    if (options.baseURL != null) {
-      context.setBaseUrl(options.baseURL);
+    if (options.recordVideoDir != null) {
+      context.videosDir = options.recordVideoDir;
    }
-    context.setRecordHar(recordHarPath, harContentPolicy);
    return context;
  }

@@ -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,25 +68,10 @@ 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, Supplier<T> code) {
+    return super.withLogging(apiName, new WaitForEventLogger<>(this, apiName, code));
  }

-  <T> T withWaitLogging(String apiName, Function<Logger, T> code) {
-    return new WaitForEventLogger<>(this, apiName, code).get();
-  }
-
-  @Override
-  <T> T withLogging(String apiName, Supplier<T> code) {
-    String previousApiName = connection.setApiName(apiName);
-    try {
-      return super.withLogging(apiName, code);
-    } finally {
-      connection.setApiName(previousApiName);
-    }
-  }

  WaitableResult<JsonElement> sendMessageAsync(String method, JsonObject params) {
    return connection.sendMessageAsync(guid, method, params);
@@ -116,10 +99,4 @@ class ChannelOwner extends LoggingSupport {

  void handleEvent(String event, JsonObject parameters) {
  }
-
-  JsonObject toProtocolRef() {
-    JsonObject json = new JsonObject();
-    json.addProperty("guid", guid);
-    return json;
-  }
 }
@@ -16,17 +16,27 @@
 package com.microsoft.playwright.impl;

 import com.google.gson.Gson;
+import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
-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.io.InputStream;
+import java.io.OutputStream;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+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;

 class Message {
@@ -55,60 +65,33 @@ 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;
  static {
    String debug = System.getenv("DEBUG");
    isLogging = (debug != null) && debug.contains("pw:channel");
  }
-  LocalUtils localUtils;
-  final Map<String, String> env;

  class Root extends ChannelOwner {
    Root(Connection connection) {
-      super(connection, "Root", "");
-    }
-
-    Playwright initialize() {
-      JsonObject params = new JsonObject();
-      params.addProperty("sdkLanguage", "java");
-      JsonElement result = sendMessage("initialize", params.getAsJsonObject());
-      return this.connection.getExistingObject(result.getAsJsonObject().getAsJsonObject("playwright").get("guid").getAsString());
+      super(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;
-    if (isLogging) {
-      transport = new TransportLogger(transport);
-    }
+  Connection(Transport transport) {
    this.transport = transport;
    root = new Root(this);
-    stackTraceCollector = StackTraceCollector.createFromEnv(env);
-  }
-
-  boolean isCollectingStacks() {
-    return stackTraceCollector != null;
-  }
-
-  String setApiName(String name) {
-    String previous = apiName;
-    apiName = name;
-    return previous;
+    String srcRoot = System.getenv("PLAYWRIGHT_JAVA_SRC");
+    if (srcRoot == null) {
+      srcDir = null;
+    } else {
+      srcDir = Paths.get(srcRoot);
+      if (!Files.exists(srcDir)) {
+        throw new PlaywrightException("PLAYWRIGHT_JAVA_SRC environment variable points to non-existing location: '" + srcRoot + "'");
+      }
+    }
  }

  void close() throws IOException {
@@ -123,6 +106,45 @@ public class Connection {
    return internalSendMessage(guid, method, params);
  }

+  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<>();
@@ -132,28 +154,24 @@ public class Connection {
    message.addProperty("guid", guid);
    message.addProperty("method", method);
    message.add("params", params);
-    JsonObject metadata = new JsonObject();
-    if (apiName == null) {
-      metadata.addProperty("internal", true);
-    } else {
-      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) {
-        metadata.add("stack", stackTraceCollector.currentStackTrace());
-      }
+    if (srcDir != null) {
+      JsonObject metadata = new JsonObject();
+      metadata.add("stack", currentStackTrace());
+      message.add("metadata", metadata);
    }
-    message.add("metadata", metadata);
-    transport.send(message);
+    String messageString = gson().toJson(message);
+    if (isLogging) {
+      logWithTimestamp("SEND ► " + messageString);
+    }
+    transport.send(messageString);
    return result;
  }

-  public PlaywrightImpl initializePlaywright() {
-    return (PlaywrightImpl) this.root.initialize();
-  }
-
-  LocalUtils localUtils() {
-    return localUtils;
+  public ChannelOwner waitForObjectWithKnownName(String guid) {
+    while (!objects.containsKey(guid)) {
+      processOneMessage();
+    }
+    return objects.get(guid);
  }

  public <T> T getExistingObject(String guid) {
@@ -172,13 +190,16 @@ public class Connection {
  }

  void processOneMessage() {
-    JsonObject message = transport.poll(Duration.ofMillis(10));
-    if (message == null) {
+    String messageString = transport.poll(Duration.ofMillis(10));
+    if (messageString == null) {
      return;
    }
+    if (isLogging) {
+      logWithTimestamp("◀ RECV " + messageString);
+    }
    Gson gson = gson();
-    Message messageObj = gson.fromJson(message, Message.class);
-    dispatch(messageObj);
+    Message message = gson.fromJson(messageString, Message.class);
+    dispatch(message);
  }

  private void dispatch(Message message) {
@@ -212,24 +233,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);
  }

@@ -280,25 +295,12 @@ public class Connection {
      case "ElementHandle":
        result = new ElementHandleImpl(parent, type, guid, initializer);
        break;
-      case "APIRequestContext":
-        // Create fake object as this API is experimental an only exposed in Node.js.
-        result = new APIRequestContextImpl(parent, type, guid, initializer);
-        break;
      case "Frame":
        result = new FrameImpl(parent, type, guid, initializer);
        break;
      case "JSHandle":
        result = new JSHandleImpl(parent, type, guid, initializer);
        break;
-      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;
@@ -320,20 +322,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);
    }
@@ -18,18 +18,15 @@ package com.microsoft.playwright.impl;

 import com.google.gson.JsonObject;
 import com.microsoft.playwright.Download;
-import com.microsoft.playwright.Page;

 import java.io.InputStream;
 import java.nio.file.Path;

-class DownloadImpl implements Download {
-  private final PageImpl page;
+class DownloadImpl extends LoggingSupport implements Download {
  private final ArtifactImpl artifact;
  private final JsonObject initializer;

-  DownloadImpl(PageImpl page, ArtifactImpl artifact, JsonObject initializer) {
-    this.page = page;
+  DownloadImpl(ArtifactImpl artifact, JsonObject initializer) {
    this.artifact = artifact;
    this.initializer = initializer;
  }
@@ -44,38 +41,28 @@ class DownloadImpl implements Download {
    return initializer.get("suggestedFilename").getAsString();
  }

-  @Override
-  public void cancel() {
-    page.withLogging("Download.cancel", () -> artifact.cancel());
-  }
-
  @Override
  public InputStream createReadStream() {
-    return page.withLogging("Download.createReadStream", () -> artifact.createReadStream());
+    return withLogging("Download.createReadStream", () -> artifact.createReadStream());
  }

  @Override
  public void delete() {
-    page.withLogging("Download.delete", () -> artifact.delete());
+    withLogging("Download.delete", () -> artifact.delete());
  }

  @Override
  public String failure() {
-    return page.withLogging("Download.failure", () -> artifact.failure());
-  }
-
-  @Override
-  public Page page() {
-    return page;
+    return withLogging("Download.failure", () -> artifact.failure());
  }

  @Override
  public Path path() {
-    return page.withLogging("Download.path", () -> artifact.pathAfterFinished());
+    return withLogging("Download.path", () -> artifact.pathAfterFinished());
  }

  @Override
  public void saveAs(Path path) {
-    page.withLogging("Download.saveAs", () -> artifact.saveAs(path));
+    withLogging("Download.saveAs", () -> artifact.saveAs(path));
  }
 }
@@ -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,6 @@ 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.options.ScreenshotType.JPEG;
 import static com.microsoft.playwright.options.ScreenshotType.PNG;

@@ -210,15 +209,10 @@ public class ElementHandleImpl extends JSHandleImpl implements ElementHandle {

  @Override
  public void hover(HoverOptions options) {
-    withLogging("ElementHandle.hover", () -> hoverImpl(options));
-  }
-
-  private void hoverImpl(HoverOptions options) {
-    if (options == null) {
-      options = new HoverOptions();
-    }
-    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
-    sendMessage("hover", params);
+    withLogging("ElementHandle.hover", () -> {
+      JsonObject params = gson().toJsonTree(options).getAsJsonObject();
+      sendMessage("hover", params);
+    });
  }

  @Override
@@ -237,20 +231,6 @@ public class ElementHandleImpl extends JSHandleImpl implements ElementHandle {
    });
  }

-  @Override
-  public String inputValue(InputValueOptions options) {
-    return withLogging("ElementHandle.inputValue", () -> inputValueImpl(options));
-  }
-
-  private String inputValueImpl(InputValueOptions options) {
-    if (options == null) {
-      options = new InputValueOptions();
-    }
-    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
-    JsonObject json = sendMessage("inputValue", params).getAsJsonObject();
-    return json.get("value").getAsString();
-  }
-
  @Override
  public boolean isChecked() {
    return withLogging("ElementHandle.isChecked", () -> {
@@ -300,7 +280,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 +355,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
@@ -435,15 +412,6 @@ public class ElementHandleImpl extends JSHandleImpl implements ElementHandle {
    withLogging("ElementHandle.selectText", () -> selectTextImpl(options));
  }

-  @Override
-  public void setChecked(boolean checked, SetCheckedOptions options) {
-    if (checked) {
-      check(convertType(options, CheckOptions.class));
-    } else {
-      uncheck(convertType(options, UncheckOptions.class));
-    }
-  }
-
  @Override
  public void setInputFiles(Path files, SetInputFilesOptions options) {
    setInputFiles(new Path[]{files}, options);
@@ -459,24 +427,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 +441,6 @@ public class ElementHandleImpl extends JSHandleImpl implements ElementHandle {
  }

  void setInputFilesImpl(FilePayload[] files, SetInputFilesOptions options) {
-    checkFilePayloadSize(files);
    if (options == null) {
      options = new SetInputFilesOptions();
    }
@@ -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)));
  }
 }
@@ -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;
-  }
-}
@@ -31,18 +31,16 @@ 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.options.LoadState.*;
 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;
  private String url;
  FrameImpl parentFrame;
  Set<FrameImpl> childFrames = new LinkedHashSet<>();
-  private final Set<WaitUntilState> loadStates = new HashSet<>();
-
+  private final Set<LoadState> loadStates = new HashSet<>();
  enum InternalEventType { NAVIGATED, LOADSTATE }
  private final ListenerCollection<InternalEventType> internalListeners = new ListenerCollection<>();
  PageImpl page;
@@ -62,26 +60,22 @@ public class FrameImpl extends ChannelOwner implements Frame {
    }
  }

-  private static WaitUntilState loadStateFromProtocol(String value) {
+  private static LoadState loadStateFromProtocol(String value) {
    switch (value) {
      case "load": return LOAD;
      case "domcontentloaded": return DOMCONTENTLOADED;
      case "networkidle": return NETWORKIDLE;
-      case "commit": return COMMIT;
      default: throw new PlaywrightException("Unexpected value: " + value);
    }
  }

  @Override
-  public ElementHandle querySelector(String selector, QuerySelectorOptions options) {
-    return withLogging("Frame.querySelector", () -> querySelectorImpl(selector, options));
+  public ElementHandle querySelector(String selector) {
+    return withLogging("Frame.querySelector", () -> querySelectorImpl(selector));
  }

-  ElementHandleImpl querySelectorImpl(String selector, QuerySelectorOptions options) {
-    if (options == null) {
-      options = new QuerySelectorOptions();
-    }
-    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
+  ElementHandleImpl querySelectorImpl(String selector) {
+    JsonObject params = new JsonObject();
    params.addProperty("selector", selector);
    JsonElement json = sendMessage("querySelector", params);
    JsonObject element = json.getAsJsonObject().getAsJsonObject("element");
@@ -110,7 +104,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
@@ -135,15 +133,12 @@ public class FrameImpl extends ChannelOwner implements Frame {
  }

  @Override
-  public Object evalOnSelector(String selector, String pageFunction, Object arg, EvalOnSelectorOptions options) {
-    return withLogging("Frame.evalOnSelector", () -> evalOnSelectorImpl(selector, pageFunction, arg, options));
+  public Object evalOnSelector(String selector, String pageFunction, Object arg) {
+    return withLogging("Frame.evalOnSelector", () -> evalOnSelectorImpl(selector, pageFunction, arg));
  }

-  Object evalOnSelectorImpl(String selector, String pageFunction, Object arg, EvalOnSelectorOptions options) {
-    if (options == null) {
-      options = new EvalOnSelectorOptions();
-    }
-    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
+  Object evalOnSelectorImpl(String selector, String pageFunction, Object arg) {
+    JsonObject params = new JsonObject();
    params.addProperty("selector", selector);
    params.addProperty("expression", pageFunction);
    params.add("arg", gson().toJsonTree(serializeArgument(arg)));
@@ -355,11 +350,6 @@ public class FrameImpl extends ChannelOwner implements Frame {

  }

-  @Override
-  public FrameLocator frameLocator(String selector) {
-    return new FrameLocatorImpl(this, selector);
-  }
-
  ElementHandle frameElementImpl() {
    JsonObject json = sendMessage("frameElement").getAsJsonObject();
    return connection.getExistingObject(json.getAsJsonObject("element").get("guid").getAsString());
@@ -370,71 +360,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();
@@ -482,21 +407,6 @@ public class FrameImpl extends ChannelOwner implements Frame {
    sendMessage("hover", params);
  }

-  @Override
-  public void dragAndDrop(String source, String target, DragAndDropOptions options) {
-    withLogging("Frame.dragAndDrop", () -> dragAndDropImpl(source, target, options));
-  }
-
-  void dragAndDropImpl(String source, String target, DragAndDropOptions options) {
-    if (options == null) {
-      options = new DragAndDropOptions();
-    }
-    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
-    params.addProperty("source", source);
-    params.addProperty("target", target);
-    sendMessage("dragAndDrop", params);
-  }
-
  @Override
  public String innerHTML(String selector, InnerHTMLOptions options) {
    return withLogging("Frame.innerHTML", () -> innerHTMLImpl(selector, options));
@@ -527,21 +437,6 @@ public class FrameImpl extends ChannelOwner implements Frame {
    return json.get("value").getAsString();
  }

-  @Override
-  public String inputValue(String selector, InputValueOptions options) {
-    return withLogging("Frame.inputValue", () -> inputValueImpl(selector, options));
-  }
-
-  String inputValueImpl(String selector, InputValueOptions options) {
-    if (options == null) {
-      options = new InputValueOptions();
-    }
-    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
-    params.addProperty("selector", selector);
-    JsonObject json = sendMessage("inputValue", params).getAsJsonObject();
-    return json.get("value").getAsString();
-  }
-
  @Override
  public boolean isChecked(String selector, IsCheckedOptions options) {
    return withLogging("Page.isChecked", () -> isCheckedImpl(selector, options));
@@ -627,11 +522,6 @@ public class FrameImpl extends ChannelOwner implements Frame {
    return withLogging("Page.isVisible", () -> isVisibleImpl(selector, options));
  }

-  @Override
-  public Locator locator(String selector, LocatorOptions options) {
-    return new LocatorImpl(this, selector, convertType(options, Locator.LocatorOptions.class));
-  }
-
  boolean isVisibleImpl(String selector, IsVisibleOptions options) {
    if (options == null) {
      options = new IsVisibleOptions();
@@ -648,7 +538,7 @@ public class FrameImpl extends ChannelOwner implements Frame {
  }

  @Override
-  public PageImpl page() {
+  public Page page() {
    return page;
  }

@@ -689,18 +579,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));
@@ -723,19 +601,6 @@ public class FrameImpl extends ChannelOwner implements Frame {
    return parseStringList(json.getAsJsonArray("values"));
  }

-  @Override
-  public void setChecked(String selector, boolean checked, SetCheckedOptions options) {
-    withLogging("Frame.setChecked", () -> setCheckedImpl(selector, checked, options));
-  }
-
-  void setCheckedImpl(String selector, boolean checked, SetCheckedOptions options) {
-    if (checked) {
-      checkImpl(selector, convertType(options, CheckOptions.class));
-    } else {
-      uncheckImpl(selector, convertType(options, UncheckOptions.class));
-    }
-  }
-
  @Override
  public void setContent(String html, SetContentOptions options) {
    withLogging("Frame.setContent", () -> setContentImpl(html, options));
@@ -760,32 +625,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 +739,10 @@ public class FrameImpl extends ChannelOwner implements Frame {

  @Override
  public void waitForLoadState(LoadState state, WaitForLoadStateOptions options) {
-    withWaitLogging("Frame.waitForLoadState", logger -> {
-      waitForLoadStateImpl(state, options, logger);
-      return null;
-    });
+    withLogging("Frame.waitForLoadState", () -> waitForLoadStateImpl(state, options));
  }

-  void waitForLoadStateImpl(LoadState state, WaitForLoadStateOptions options, Logger logger) {
-    waitForLoadStateImpl(convertType(state, WaitUntilState.class), options, logger);
-  }
-
-  private void waitForLoadStateImpl(WaitUntilState state, WaitForLoadStateOptions options, Logger logger) {
+  void waitForLoadStateImpl(LoadState state, WaitForLoadStateOptions options) {
    if (options == null) {
      options = new WaitForLoadStateOptions();
    }
@@ -904,20 +751,18 @@ 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));
  }

-  private class WaitForLoadStateHelper implements Waitable<Void>, Consumer<WaitUntilState> {
-    private final WaitUntilState expectedState;
-    private final Logger logger;
+  private class WaitForLoadStateHelper implements Waitable<Void>, Consumer<LoadState> {
+    private final LoadState expectedState;
    private boolean isDone;

-    WaitForLoadStateHelper(WaitUntilState state, Logger logger) {
+    WaitForLoadStateHelper(LoadState state) {
      expectedState = state;
-      this.logger = logger;
      isDone = loadStates.contains(state);
      if (!isDone) {
        internalListeners.add(InternalEventType.LOADSTATE, this);
@@ -925,8 +770,7 @@ public class FrameImpl extends ChannelOwner implements Frame {
    }

    @Override
-    public void accept(WaitUntilState state) {
-      logger.log("  load state changed to " + state);
+    public void accept(LoadState state) {
      if (expectedState.equals(state)) {
        isDone = true;
        dispose();
@@ -949,25 +793,21 @@ 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 final LoadState expectedLoadState;
    private WaitForLoadStateHelper loadStateHelper;

    private RequestImpl request;
    private RuntimeException exception;

-    WaitForNavigationHelper(UrlMatcher matcher, WaitUntilState expectedLoadState, Logger logger) {
+    WaitForNavigationHelper(UrlMatcher matcher, LoadState 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 +819,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 +858,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();
    }
@@ -1035,10 +875,9 @@ public class FrameImpl extends ChannelOwner implements Frame {

    List<Waitable<Response>> waitables = new ArrayList<>();
    if (matcher == null) {
-      matcher = UrlMatcher.forOneOf(page.context().baseUrl, options.url);
+      matcher = UrlMatcher.forOneOf(options.url);
    }
-    logger.log("waiting for navigation " + matcher);
-    waitables.add(new WaitForNavigationHelper(matcher, options.waitUntil, logger));
+    waitables.add(new WaitForNavigationHelper(matcher, convertViaJson(options.waitUntil, LoadState.class)));
    waitables.add(page.createWaitForCloseHelper());
    waitables.add(page.createWaitableFrameDetach(this));
    waitables.add(page.createWaitableNavigationTimeout(options.timeout));
@@ -1051,16 +890,11 @@ public class FrameImpl extends ChannelOwner implements Frame {
  }

  ElementHandle waitForSelectorImpl(String selector, WaitForSelectorOptions options) {
-    return waitForSelectorImpl(selector, options, false);
-  }
-
-  ElementHandle waitForSelectorImpl(String selector, WaitForSelectorOptions options, boolean omitReturnValue) {
    if (options == null) {
      options = new WaitForSelectorOptions();
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
    params.addProperty("selector", selector);
-    params.addProperty("omitReturnValue", omitReturnValue);
    JsonElement json = sendMessage("waitForSelector", params);
    JsonObject element = json.getAsJsonObject().getAsJsonObject("element");
    if (element == null) {
@@ -1075,14 +909,18 @@ public class FrameImpl extends ChannelOwner implements Frame {
  }

  void waitForTimeoutImpl(double timeout) {
-    JsonObject params = new JsonObject();
-    params.addProperty("timeout", timeout);
-    sendMessage("waitForTimeout", params);
+    runUntil(() -> {}, new WaitableTimeout<Void>(timeout) {
+      @Override
+      public Void get() {
+        // Override to not throw.
+        return null;
+      }
+    });
  }

  @Override
  public void waitForURL(String url, WaitForURLOptions options) {
-    waitForURL(new UrlMatcher(page.context().baseUrl, url), options);
+    waitForURL(new UrlMatcher(url), options);
  }

  @Override
@@ -1096,50 +934,27 @@ 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(convertViaJson(options.waitUntil, LoadState.class),
+        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) {
    if ("loadstate".equals(event)) {
      JsonElement add = params.get("add");
      if (add != null) {
-        WaitUntilState state = loadStateFromProtocol(add.getAsString());
+        LoadState 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");
@@ -1,126 +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.FrameLocator;
-import com.microsoft.playwright.Locator;
-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;
-  private final String frameSelector;
-
-  FrameLocatorImpl(FrameImpl frame, String selector) {
-    this.frame = frame;
-    this.frameSelector = selector;
-  }
-
-  @Override
-  public FrameLocator first() {
-    return new FrameLocatorImpl(frame, frameSelector + " >> nth=0");
-  }
-
-  @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)));
-  }
-
-  @Override
-  public FrameLocator last() {
-    return new FrameLocatorImpl(frame, frameSelector + " >> nth=-1");
-  }
-
-  @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 FrameLocator nth(int index) {
-    return new FrameLocatorImpl(frame, frameSelector + " >> nth=" + index);
-  }
-}
@@ -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);
-  }
-}
@@ -1,109 +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 java.io.IOException;
-import java.time.Duration;
-import java.time.Instant;
-import java.util.LinkedList;
-import java.util.Queue;
-import java.util.function.Consumer;
-
-import static com.microsoft.playwright.impl.Serialization.gson;
-
-class JsonPipe extends ChannelOwner implements Transport {
-  private final Queue<JsonObject> incoming = new LinkedList<>();
-  private ListenerCollection<EventType> listeners = new ListenerCollection<>();
-  private enum EventType { CLOSE }
-  private boolean isClosed;
-
-  JsonPipe(ChannelOwner parent, String type, String guid, JsonObject initializer) {
-    super(parent, type, guid, initializer);
-  }
-
-  @Override
-  public void send(JsonObject message) {
-    checkIfClosed();
-    JsonObject params = new JsonObject();
-    params.add("message", message);
-    sendMessage("send", params);
-  }
-
-  @Override
-  public JsonObject poll(Duration timeout) {
-    Instant start = Instant.now();
-    return runUntil(() -> {}, new Waitable<JsonObject>() {
-      JsonObject message;
-      @Override
-      public boolean isDone() {
-        if (!incoming.isEmpty()) {
-          message = incoming.remove();
-          return true;
-        }
-        checkIfClosed();
-        if (Duration.between(start, Instant.now()).compareTo(timeout) > 0) {
-          return true;
-        }
-        return false;
-      }
-
-      @Override
-      public JsonObject get() {
-        return message;
-      }
-
-      @Override
-      public void dispose() {
-      }
-    });
-  }
-
-  @Override
-  public void close() throws IOException {
-    if (!isClosed) {
-      sendMessage("close");
-    }
-  }
-
-  void onClose(Consumer<JsonPipe> handler) {
-    listeners.add(EventType.CLOSE, handler);
-  }
-
-  void offClose(Consumer<JsonPipe> handler) {
-    listeners.remove(EventType.CLOSE, handler);
-  }
-
-
-  @Override
-  protected void handleEvent(String event, JsonObject params) {
-    if ("message".equals(event)) {
-      incoming.add(params.get("message").getAsJsonObject());
-    } else if ("closed".equals(event)) {
-      isClosed = true;
-      listeners.notify(EventType.CLOSE, this);
-    }
-  }
-
-  private void checkIfClosed() {
-    if (isClosed) {
-      throw new PlaywrightException("Browser has been closed");
-    }
-  }
-}
@@ -21,7 +21,7 @@ import com.microsoft.playwright.Keyboard;

 import static com.microsoft.playwright.impl.Serialization.gson;

-class KeyboardImpl implements Keyboard {
+class KeyboardImpl extends LoggingSupport implements Keyboard {
  private final ChannelOwner page;

  KeyboardImpl(ChannelOwner page) {
@@ -30,7 +30,7 @@ class KeyboardImpl implements Keyboard {

  @Override
  public void down(String key) {
-    page.withLogging("Keyboard.down", () -> {
+    withLogging("Keyboard.down", () -> {
      JsonObject params = new JsonObject();
      params.addProperty("key", key);
      page.sendMessage("keyboardDown", params);
@@ -39,7 +39,7 @@ class KeyboardImpl implements Keyboard {

  @Override
  public void insertText(String text) {
-    page.withLogging("Keyboard.insertText", () -> {
+    withLogging("Keyboard.insertText", () -> {
      JsonObject params = new JsonObject();
      params.addProperty("text", text);
      page.sendMessage("keyboardInsertText", params);
@@ -48,7 +48,7 @@ class KeyboardImpl implements Keyboard {

  @Override
  public void press(String key, PressOptions options) {
-    page.withLogging("Keyboard.press", () -> pressImpl(key, options));
+    withLogging("Keyboard.press", () -> pressImpl(key, options));
  }

  private void pressImpl(String key, PressOptions options) {
@@ -62,7 +62,7 @@ class KeyboardImpl implements Keyboard {

    @Override
  public void type(String text, TypeOptions options) {
-    page.withLogging("Keyboard.type", () -> typeImpl(text, options));
+    withLogging("Keyboard.type", () -> typeImpl(text, options));
  }

  private void typeImpl(String text, TypeOptions options) {
@@ -76,7 +76,7 @@ class KeyboardImpl implements Keyboard {

  @Override
  public void up(String key) {
-    page.withLogging("Keyboard.up", () -> {
+    withLogging("Keyboard.up", () -> {
      JsonObject params = new JsonObject();
      params.addProperty("key", key);
      page.sendMessage("keyboardUp", params);
@@ -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);
-  }
 }
@@ -1,358 +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.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;
-
-public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAssertions {
-  public LocatorAssertionsImpl(Locator locator) {
-    this(locator, false);
-  }
-
-  private LocatorAssertionsImpl(Locator locator, boolean isNot) {
-    super((LocatorImpl) locator, isNot);
-  }
-
-  @Override
-  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));
-  }
-
-  @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));
-  }
-
-  @Override
-  public void containsText(String[] strings, ContainsTextOptions options) {
-    List<ExpectedTextValue> list = new ArrayList<>();
-    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));
-  }
-
-  @Override
-  public void containsText(Pattern[] patterns, ContainsTextOptions options) {
-    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));
-  }
-
-  @Override
-  public void hasAttribute(String name, String text, HasAttributeOptions options) {
-    ExpectedTextValue expected = new ExpectedTextValue();
-    expected.string = text;
-    hasAttribute(name, expected, text, options);
-  }
-
-  @Override
-  public void hasAttribute(String name, Pattern pattern, HasAttributeOptions options) {
-    ExpectedTextValue expected = expectedRegex(pattern);
-    hasAttribute(name, expected, pattern, options);
-  }
-
-  private void hasAttribute(String name, ExpectedTextValue expectedText, Object expectedValue, HasAttributeOptions options) {
-    if (options == null) {
-      options = new HasAttributeOptions();
-    }
-    FrameExpectOptions commonOptions = convertType(options, FrameExpectOptions.class);
-    commonOptions.expressionArg = name;
-    String message = "Locator expected to have attribute '" + name + "'";
-    if (expectedValue instanceof Pattern) {
-      message += " matching regex";
-    }
-    expectImpl("to.have.attribute", expectedText, expectedValue, message, commonOptions);
-  }
-
-  @Override
-  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));
-  }
-
-  @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));
-  }
-
-  @Override
-  public void hasClass(String[] strings, HasClassOptions options) {
-    List<ExpectedTextValue> list = new ArrayList<>();
-    for (String text : strings) {
-      ExpectedTextValue expected = new ExpectedTextValue();
-      expected.string = text;
-      list.add(expected);
-    }
-    expectImpl("to.have.class.array", list, strings, "Locator expected to have class", convertType(options, FrameExpectOptions.class));
-  }
-
-  @Override
-  public void hasClass(Pattern[] patterns, HasClassOptions options) {
-    List<ExpectedTextValue> list = new ArrayList<>();
-    for (Pattern pattern : patterns) {
-      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));
-  }
-
-  @Override
-  public void hasCount(int count, HasCountOptions options) {
-    if (options == null) {
-      options = new HasCountOptions();
-    }
-    FrameExpectOptions commonOptions = convertType(options, FrameExpectOptions.class);
-    commonOptions.expectedNumber = count;
-    List<ExpectedTextValue> expectedText = null;
-    expectImpl("to.have.count", expectedText, count, "Locator expected to have count", commonOptions);
-  }
-
-  @Override
-  public void hasCSS(String name, String value, HasCSSOptions options) {
-    ExpectedTextValue expected = new ExpectedTextValue();
-    expected.string = value;
-    hasCSS(name, expected, value, options);
-  }
-
-  @Override
-  public void hasCSS(String name, Pattern pattern, HasCSSOptions options) {
-    ExpectedTextValue expected = expectedRegex(pattern);
-    hasCSS(name, expected, pattern, options);
-  }
-
-  private void hasCSS(String name, ExpectedTextValue expectedText, Object expectedValue, HasCSSOptions options) {
-    if (options == null) {
-      options = new HasCSSOptions();
-    }
-    FrameExpectOptions commonOptions = convertType(options, FrameExpectOptions.class);
-    commonOptions.expressionArg = name;
-    String message = "Locator expected to have CSS property '" + name + "'";
-    if (expectedValue instanceof Pattern) {
-      message += " matching regex";
-    }
-    expectImpl("to.have.css", expectedText, expectedValue, message, commonOptions);
-  }
-
-  @Override
-  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));
-  }
-
-  @Override
-  public void hasJSProperty(String name, Object value, HasJSPropertyOptions options) {
-    if (options == null) {
-      options = new HasJSPropertyOptions();
-    }
-    FrameExpectOptions commonOptions = convertType(options, FrameExpectOptions.class);
-    commonOptions.expressionArg = name;
-    commonOptions.expectedValue = serializeArgument(value);
-    List<ExpectedTextValue> list = null;
-    expectImpl("to.have.property", list, value, "Locator expected to have JavaScript property '" + name + "'", commonOptions);
-  }
-
-  @Override
-  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));
-  }
-
-  @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));
-  }
-
-  @Override
-  public void hasText(String[] strings, HasTextOptions options) {
-    List<ExpectedTextValue> list = new ArrayList<>();
-    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));
-  }
-
-  @Override
-  public void hasText(Pattern[] patterns, HasTextOptions options) {
-    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));
-  }
-
-  @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));
-  }
-
-  @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));
-  }
-
-  @Override
-  public void isChecked(IsCheckedOptions options) {
-    String expression = (options != null && options.checked != null && !options.checked) ? "to.be.unchecked" : "to.be.checked";
-    expectTrue(expression, "Locator expected to be checked", convertType(options, FrameExpectOptions.class));
-  }
-
-  @Override
-  public void isDisabled(IsDisabledOptions options) {
-    expectTrue("to.be.disabled", "Locator expected to be disabled", convertType(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;
-    expectTrue(editable ? "to.be.editable" : "to.be.readonly", "Locator expected to be editable", frameOptions);
-  }
-
-  @Override
-  public void isEmpty(IsEmptyOptions options) {
-    expectTrue("to.be.empty", "Locator expected to be empty", convertType(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;
-    expectTrue(enabled ? "to.be.enabled" : "to.be.disabled", "Locator expected to be enabled", frameOptions);
-  }
-
-  @Override
-  public void isFocused(IsFocusedOptions options) {
-    expectTrue("to.be.focused", "Locator expected to be focused", convertType(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 isVisible(IsVisibleOptions options) {
-    FrameExpectOptions frameOptions = convertType(options, FrameExpectOptions.class);
-    boolean visible = options == null || options.visible == null || options.visible == true;
-    expectTrue(visible ? "to.be.visible" : "to.be.hidden", "Locator expected to be visible", frameOptions);
-  }
-
-  private void expectTrue(String expression, String message, FrameExpectOptions options) {
-    List<ExpectedTextValue> expectedText = null;
-    expectImpl(expression, expectedText, null, message, options);
-  }
-
-  @Override
-  public LocatorAssertions not() {
-    return new LocatorAssertionsImpl(actualLocator, !isNot);
-  }
-
-  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;
-    }
-  }
-}
@@ -1,585 +0,0 @@
-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 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;
-
-class LocatorImpl implements Locator {
-  private final FrameImpl frame;
-  private final String selector;
-
-  public LocatorImpl(FrameImpl frame, String selector, LocatorOptions options) {
-    this.frame = frame;
-    if (options != null) {
-      if (options.hasText != null) {
-        selector += " >> internal:has-text=" + escapeForTextSelector(options.hasText, 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);
-      }
-    }
-    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);
-    // TODO: support deadline based timeout
-//    Double timeout = null;
-//    if (handleOptions != null) {
-//      timeout = handleOptions.timeout;
-//    }
-//    timeout = frame.page.timeoutSettings.timeout(timeout);
-//    long deadline = System.nanoTime() + (long) timeout.doubleValue() * 1_000_000;
-    ElementHandle handle = elementHandle(handleOptions);
-    try {
-      return callback.apply(handle, options);
-    } finally {
-      if (handle != null) {
-        handle.dispose();
-      }
-    }
-  }
-
-  @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)");
-  }
-
-  @Override
-  public List<String> allTextContents() {
-    return (List<String>) frame.evalOnSelectorAll(selector, "ee => ee.map(e => e.textContent || '')");
-  }
-
-  @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);
-  }
-
-  @Override
-  public void check(CheckOptions options) {
-    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));
-  }
-
-  @Override
-  public void click(ClickOptions options) {
-    if (options == null) {
-      options = new ClickOptions();
-    }
-    frame.click(selector, convertType(options, Frame.ClickOptions.class).setStrict(true));
-  }
-
-  @Override
-  public int count() {
-    return frame.queryCount(selector);
-  }
-
-  @Override
-  public void dblclick(DblclickOptions options) {
-    if (options == null) {
-      options = new DblclickOptions();
-    }
-    frame.dblclick(selector, convertType(options, Frame.DblclickOptions.class).setStrict(true));
-  }
-
-  @Override
-  public void dispatchEvent(String type, Object eventInit, DispatchEventOptions options) {
-    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);
-  }
-
-  @Override
-  public ElementHandle elementHandle(ElementHandleOptions options) {
-    if (options == null) {
-      options = new ElementHandleOptions();
-    }
-    Frame.WaitForSelectorOptions frameOptions = convertType(options, Frame.WaitForSelectorOptions.class);
-    frameOptions.setStrict(true);
-    frameOptions.setState(WaitForSelectorState.ATTACHED);
-    return frame.waitForSelector(selector, frameOptions);
-  }
-
-  @Override
-  public List<ElementHandle> elementHandles() {
-    return frame.querySelectorAll(selector);
-  }
-
-  @Override
-  public Object evaluate(String expression, Object arg, EvaluateOptions options) {
-    return withElement((h, o) -> h.evaluate(expression, arg), options);
-  }
-
-  @Override
-  public Object evaluateAll(String expression, Object arg) {
-    return frame.evalOnSelectorAll(selector, expression, arg);
-  }
-
-  @Override
-  public JSHandle evaluateHandle(String expression, Object arg, EvaluateHandleOptions options) {
-    return withElement((h, o) -> h.evaluateHandle(expression, arg), options);
-  }
-
-  @Override
-  public void fill(String value, FillOptions options) {
-    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));
-  }
-
-  @Override
-  public Locator first() {
-    return new LocatorImpl(frame, selector + " >> nth=0", null);
-  }
-
-  @Override
-  public void focus(FocusOptions options) {
-    if (options == null) {
-      options = new FocusOptions();
-    }
-    frame.focus(selector, convertType(options, Frame.FocusOptions.class).setStrict(true));
-  }
-
-  @Override
-  public FrameLocatorImpl frameLocator(String selector) {
-    return new FrameLocatorImpl(frame, this.selector + " >> " + selector);
-  }
-
-  @Override
-  public String getAttribute(String name, GetAttributeOptions options) {
-    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);
-  }
-
-  @Override
-  public void hover(HoverOptions options) {
-    if (options == null) {
-      options = new HoverOptions();
-    }
-    frame.hover(selector, convertType(options, Frame.HoverOptions.class).setStrict(true));
-  }
-
-  @Override
-  public String innerHTML(InnerHTMLOptions options) {
-    if (options == null) {
-      options = new InnerHTMLOptions();
-    }
-    return frame.innerHTML(selector, convertType(options, Frame.InnerHTMLOptions.class).setStrict(true));
-  }
-
-  @Override
-  public String innerText(InnerTextOptions options) {
-    if (options == null) {
-      options = new InnerTextOptions();
-    }
-    return frame.innerText(selector, convertType(options, Frame.InnerTextOptions.class).setStrict(true));
-  }
-
-  @Override
-  public String inputValue(InputValueOptions options) {
-    if (options == null) {
-      options = new InputValueOptions();
-    }
-    return frame.inputValue(selector, convertType(options, Frame.InputValueOptions.class).setStrict(true));
-  }
-
-  @Override
-  public boolean isChecked(IsCheckedOptions options) {
-    if (options == null) {
-      options = new IsCheckedOptions();
-    }
-    return frame.isChecked(selector, convertType(options, Frame.IsCheckedOptions.class).setStrict(true));
-  }
-
-  @Override
-  public boolean isDisabled(IsDisabledOptions options) {
-    if (options == null) {
-      options = new IsDisabledOptions();
-    }
-    return frame.isDisabled(selector, convertType(options, Frame.IsDisabledOptions.class).setStrict(true));
-  }
-
-  @Override
-  public boolean isEditable(IsEditableOptions options) {
-    if (options == null) {
-      options = new IsEditableOptions();
-    }
-    return frame.isEditable(selector, convertType(options, Frame.IsEditableOptions.class).setStrict(true));
-  }
-
-  @Override
-  public boolean isEnabled(IsEnabledOptions options) {
-    if (options == null) {
-      options = new IsEnabledOptions();
-    }
-    return frame.isEnabled(selector, convertType(options, Frame.IsEnabledOptions.class).setStrict(true));
-  }
-
-  @Override
-  public boolean isHidden(IsHiddenOptions options) {
-    if (options == null) {
-      options = new IsHiddenOptions();
-    }
-    return frame.isHidden(selector, convertType(options, Frame.IsHiddenOptions.class).setStrict(true));
-  }
-
-  @Override
-  public boolean isVisible(IsVisibleOptions options) {
-    if (options == null) {
-      options = new IsVisibleOptions();
-    }
-    return frame.isVisible(selector, convertType(options, Frame.IsVisibleOptions.class).setStrict(true));
-  }
-
-  @Override
-  public Locator last() {
-    return new LocatorImpl(frame, selector + " >> nth=-1", null);
-  }
-
-  @Override
-  public Locator locator(String selector, LocatorOptions options) {
-    return new LocatorImpl(frame, this.selector + " >> " + selector, options);
-  }
-
-  @Override
-  public Locator nth(int index) {
-    return new LocatorImpl(frame, selector + " >> nth=" + index, null);
-  }
-
-  @Override
-  public Page page() {
-    return frame.page();
-  }
-
-  @Override
-  public void press(String key, PressOptions options) {
-    if (options == null) {
-      options = new PressOptions();
-    }
-    frame.press(selector, key, convertType(options, Frame.PressOptions.class).setStrict(true));
-  }
-
-  @Override
-  public byte[] screenshot(ScreenshotOptions options) {
-    return withElement((h, o) -> h.screenshot(o), convertType(options, ElementHandle.ScreenshotOptions.class));
-  }
-
-  @Override
-  public void scrollIntoViewIfNeeded(ScrollIntoViewIfNeededOptions options) {
-    withElement((h, o) -> {
-      h.scrollIntoViewIfNeeded(o);
-      return null;
-    }, convertType(options, ElementHandle.ScrollIntoViewIfNeededOptions.class));
-  }
-
-  @Override
-  public List<String> selectOption(String values, SelectOptionOptions options) {
-    if (options == null) {
-      options = new SelectOptionOptions();
-    }
-    return frame.selectOption(selector, values, convertType(options, Frame.SelectOptionOptions.class).setStrict(true));
-  }
-
-  @Override
-  public List<String> selectOption(ElementHandle values, SelectOptionOptions options) {
-    if (options == null) {
-      options = new SelectOptionOptions();
-    }
-    return frame.selectOption(selector, values, convertType(options, Frame.SelectOptionOptions.class).setStrict(true));
-  }
-
-  @Override
-  public List<String> selectOption(String[] values, SelectOptionOptions options) {
-    if (options == null) {
-      options = new SelectOptionOptions();
-    }
-    return frame.selectOption(selector, values, convertType(options, Frame.SelectOptionOptions.class).setStrict(true));
-  }
-
-  @Override
-  public List<String> selectOption(SelectOption values, SelectOptionOptions options) {
-    if (options == null) {
-      options = new SelectOptionOptions();
-    }
-    return frame.selectOption(selector, values, convertType(options, Frame.SelectOptionOptions.class).setStrict(true));
-  }
-
-  @Override
-  public List<String> selectOption(ElementHandle[] values, SelectOptionOptions options) {
-    if (options == null) {
-      options = new SelectOptionOptions();
-    }
-    return frame.selectOption(selector, values, convertType(options, Frame.SelectOptionOptions.class).setStrict(true));
-  }
-
-  @Override
-  public List<String> selectOption(SelectOption[] values, SelectOptionOptions options) {
-    if (options == null) {
-      options = new SelectOptionOptions();
-    }
-    return frame.selectOption(selector, values, convertType(options, Frame.SelectOptionOptions.class).setStrict(true));
-  }
-
-  @Override
-  public void selectText(SelectTextOptions options) {
-    withElement((h, o) -> {
-      h.selectText(o);
-      return null;
-    }, convertType(options, ElementHandle.SelectTextOptions.class));
-  }
-
-  @Override
-  public void setChecked(boolean checked, SetCheckedOptions options) {
-    if (options == null) {
-      options = new SetCheckedOptions();
-    }
-    frame.setChecked(selector, checked, convertType(options, Frame.SetCheckedOptions.class).setStrict(true));
-  }
-
-  @Override
-  public void setInputFiles(Path files, SetInputFilesOptions options) {
-    if (options == null) {
-      options = new SetInputFilesOptions();
-    }
-    frame.setInputFiles(selector, files, convertType(options, Frame.SetInputFilesOptions.class).setStrict(true));
-  }
-
-  @Override
-  public void setInputFiles(Path[] files, SetInputFilesOptions options) {
-    if (options == null) {
-      options = new SetInputFilesOptions();
-    }
-    frame.setInputFiles(selector, files, convertType(options, Frame.SetInputFilesOptions.class).setStrict(true));
-  }
-
-  @Override
-  public void setInputFiles(FilePayload files, SetInputFilesOptions options) {
-    if (options == null) {
-      options = new SetInputFilesOptions();
-    }
-    frame.setInputFiles(selector, files, convertType(options, Frame.SetInputFilesOptions.class).setStrict(true));
-  }
-
-  @Override
-  public void setInputFiles(FilePayload[] files, SetInputFilesOptions options) {
-    if (options == null) {
-      options = new SetInputFilesOptions();
-    }
-    frame.setInputFiles(selector, files, convertType(options, Frame.SetInputFilesOptions.class).setStrict(true));
-  }
-
-  @Override
-  public void tap(TapOptions options) {
-    if (options == null) {
-      options = new TapOptions();
-    }
-    frame.tap(selector, convertType(options, Frame.TapOptions.class).setStrict(true));
-  }
-
-  @Override
-  public String textContent(TextContentOptions options) {
-    if (options == null) {
-      options = new TextContentOptions();
-    }
-    return frame.textContent(selector, convertType(options, Frame.TextContentOptions.class).setStrict(true));
-  }
-
-  @Override
-  public void type(String text, TypeOptions options) {
-    if (options == null) {
-      options = new TypeOptions();
-    }
-    frame.type(selector, text, convertType(options, Frame.TypeOptions.class).setStrict(true));
-  }
-
-  @Override
-  public void uncheck(UncheckOptions options) {
-    if (options == null) {
-      options = new UncheckOptions();
-    }
-    frame.uncheck(selector, convertType(options, Frame.UncheckOptions.class).setStrict(true));
-  }
-
-  @Override
-  public void waitFor(WaitForOptions options) {
-    if (options == null) {
-      options = new WaitForOptions();
-    }
-    waitForImpl(options);
-  }
-
-  private void waitForImpl(WaitForOptions options) {
-    frame.withLogging("Locator.waitFor", () -> frame.waitForSelectorImpl(selector, convertType(options, Frame.WaitForSelectorOptions.class).setStrict(true), true));
-  }
-
-  @Override
-  public String toString() {
-    return "Locator@" + selector;
-  }
-
-  FrameExpectResult expect(String expression, FrameExpectOptions options) {
-    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();
-    }
-    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
-    params.addProperty("selector", selector);
-    params.addProperty("expression", expression);
-    JsonElement json = frame.sendMessage("expect", params);
-    FrameExpectResult result = gson().fromJson(json, FrameExpectResult.class);
-    return result;
-  }
-}
@@ -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("\"", "\\\\\"") + '"' + (exact ? "" : "i");
-  }
-
-  private static String toJsRegExp(Pattern pattern) {
-    return "/" + pattern.pattern() + "/" + toJsRegexFlags(pattern);
-  }
-}
@@ -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);
-}
@@ -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);
  }
@@ -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);
@@ -93,16 +93,6 @@ class MouseImpl implements Mouse {
    page.withLogging("Mouse.up", () -> upImpl(options));
  }

-  @Override
-  public void wheel(double deltaX, double deltaY) {
-    page.withLogging("Mouse.wheel", () -> {
-      JsonObject params = new JsonObject();
-      params.addProperty("deltaX", deltaX);
-      params.addProperty("deltaY", deltaY);
-      page.sendMessage("mouseWheel", params);
-    });
-  }
-
  private void upImpl(UpOptions options) {
    if (options == null) {
      options = new UpOptions();
@@ -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.Page;
-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;
-
-public class PageAssertionsImpl extends AssertionsBase implements PageAssertions {
-  private final PageImpl actualPage;
-
-  public PageAssertionsImpl(Page page) {
-    this(page, false);
-  }
-
-  private PageAssertionsImpl(Page page, boolean isNot) {
-    super((LocatorImpl) page.locator(":root"), isNot);
-    this.actualPage = (PageImpl) page;
-  }
-
-  @Override
-  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));
-  }
-
-  @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));
-  }
-
-  @Override
-  public void hasURL(String url, HasURLOptions options) {
-    ExpectedTextValue expected = new ExpectedTextValue();
-    if (actualPage.context().baseUrl != null) {
-      url = resolveUrl(actualPage.context().baseUrl, url);
-    }
-    expected.string = url;
-    expectImpl("to.have.url", expected, url, "Page URL expected to be", convertType(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));
-  }
-
-  @Override
-  public PageAssertions not() {
-    return new PageAssertionsImpl(actualPage, !isNot);
-  }
-}
-
@@ -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.*;
@@ -29,10 +28,11 @@ 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;
@@ -48,16 +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.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);
+  private 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;
@@ -118,14 +125,7 @@ public class PageImpl extends ChannelOwner implements Page {
      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();
-        }
+        dialog.dismiss();
      }
    } else if ("worker".equals(event)) {
      String guid = params.getAsJsonObject("worker").get("guid").getAsString();
@@ -144,7 +144,8 @@ public class PageImpl extends ChannelOwner implements Page {
    } else if ("download".equals(event)) {
      String artifactGuid = params.getAsJsonObject("artifact").get("guid").getAsString();
      ArtifactImpl artifact = connection.getExistingObject(artifactGuid);
-      DownloadImpl download = new DownloadImpl(this, artifact, params);
+      artifact.isRemote = browserContext.browser() != null && browserContext.browser().isRemote;
+      DownloadImpl download = new DownloadImpl(artifact, params);
      listeners.notify(EventType.DOWNLOAD, download);
    } else if ("fileChooser".equals(event)) {
      String guid = params.getAsJsonObject("element").get("guid").getAsString();
@@ -162,11 +163,32 @@ 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 ("request".equals(event)) {
+      String guid = params.getAsJsonObject("request").get("guid").getAsString();
+      Request request = connection.getExistingObject(guid);
+      listeners.notify(EventType.REQUEST, request);
+    } else if ("requestFailed".equals(event)) {
+      String guid = params.getAsJsonObject("request").get("guid").getAsString();
+      RequestImpl request = connection.getExistingObject(guid);
+      if (params.has("failureText")) {
+        request.failure = params.get("failureText").getAsString();
+      }
+      listeners.notify(EventType.REQUESTFAILED, request);
+    } else if ("requestFinished".equals(event)) {
+      String guid = params.getAsJsonObject("request").get("guid").getAsString();
+      Request request = connection.getExistingObject(guid);
+      listeners.notify(EventType.REQUESTFINISHED, request);
+    } else if ("response".equals(event)) {
+      String guid = params.getAsJsonObject("response").get("guid").getAsString();
+      Response response = connection.getExistingObject(guid);
+      listeners.notify(EventType.RESPONSE, response);
    } else if ("frameAttached".equals(event)) {
      String guid = params.getAsJsonObject("frame").get("guid").getAsString();
      FrameImpl frame = connection.getExistingObject(guid);
@@ -186,13 +208,13 @@ 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) {
-        maybeDisableNetworkInterception();
+      Route route = connection.getExistingObject(params.getAsJsonObject("route").get("guid").getAsString());
+      boolean handled = routes.handle(route);
+      if (!handled) {
+        handled = browserContext.routes.handle(route);
      }
-      if (handled == Router.HandleResult.NoMatchingHandler || handled == Router.HandleResult.Fallback) {
-        browserContext.handleRoute(route);
+      if (!handled) {
+        route.resume();
      }
    } else if ("video".equals(event)) {
      String artifactGuid = params.getAsJsonObject("artifact").get("guid").getAsString();
@@ -225,6 +247,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);
@@ -417,43 +457,43 @@ 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) {
    if (options == null) {
      options = new WaitForCloseOptions();
    }
-    return waitForEventWithTimeout(EventType.CLOSE, code, null, options.timeout);
+    return waitForEventWithTimeout(EventType.CLOSE, code, options.timeout);
  }

  @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) {
    if (options == null) {
      options = new WaitForConsoleMessageOptions();
    }
-    return waitForEventWithTimeout(EventType.CONSOLE, code, options.predicate, options.timeout);
+    return waitForEventWithTimeout(EventType.CONSOLE, code, options.timeout);
  }

  @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) {
    if (options == null) {
      options = new WaitForDownloadOptions();
    }
-    return waitForEventWithTimeout(EventType.DOWNLOAD, code, options.predicate, options.timeout);
+    return waitForEventWithTimeout(EventType.DOWNLOAD, code, options.timeout);
  }

  @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) {
@@ -461,48 +501,48 @@ public class PageImpl extends ChannelOwner implements Page {
    if (options == null) {
      options = new WaitForFileChooserOptions();
    }
-    return waitForEventWithTimeout(EventType.FILECHOOSER, code, options.predicate, options.timeout);
+    return waitForEventWithTimeout(EventType.FILECHOOSER, code, options.timeout);
  }

  @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) {
    if (options == null) {
      options = new WaitForPopupOptions();
    }
-    return waitForEventWithTimeout(EventType.POPUP, code, options.predicate, options.timeout);
+    return waitForEventWithTimeout(EventType.POPUP, code, options.timeout);
  }

  @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) {
    if (options == null) {
      options = new WaitForWebSocketOptions();
    }
-    return waitForEventWithTimeout(EventType.WEBSOCKET, code, options.predicate, options.timeout);
+    return waitForEventWithTimeout(EventType.WEBSOCKET, code, options.timeout);
  }

  @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) {
    if (options == null) {
      options = new WaitForWorkerOptions();
    }
-    return waitForEventWithTimeout(EventType.WORKER, code, options.predicate, options.timeout);
+    return waitForEventWithTimeout(EventType.WORKER, code, options.timeout);
  }

-  private <T> T waitForEventWithTimeout(EventType eventType, Runnable code, Predicate<T> predicate, Double timeout) {
+  private <T> T waitForEventWithTimeout(EventType eventType, Runnable code, Double timeout) {
    List<Waitable<T>> waitables = new ArrayList<>();
-    waitables.add(new WaitableEvent<>(listeners, eventType, predicate));
+    waitables.add(new WaitableEvent<>(listeners, eventType));
    waitables.add(createWaitForCloseHelper());
    waitables.add(createWaitableTimeout(timeout));
    return runUntil(code, new WaitableRace<>(waitables));
@@ -527,9 +567,8 @@ public class PageImpl extends ChannelOwner implements Page {
  }

  @Override
-  public ElementHandle querySelector(String selector, QuerySelectorOptions options) {
-    return withLogging("Page.querySelector", () -> mainFrame.querySelectorImpl(
-      selector, convertType(options, Frame.QuerySelectorOptions.class)));
+  public ElementHandle querySelector(String selector) {
+    return withLogging("Page.querySelector", () -> mainFrame.querySelectorImpl(selector));
  }

  @Override
@@ -538,9 +577,8 @@ 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)));
+  public Object evalOnSelector(String selector, String pageFunction, Object arg) {
+    return withLogging("Page.evalOnSelector", () -> mainFrame.evalOnSelectorImpl(selector, pageFunction, arg));
  }

  @Override
@@ -574,13 +612,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
@@ -591,13 +629,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
@@ -613,13 +651,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
@@ -676,13 +714,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
@@ -697,7 +735,7 @@ public class PageImpl extends ChannelOwner implements Page {

  @Override
  public Frame frameByUrl(String glob) {
-    return frameFor(new UrlMatcher(browserContext.baseUrl, glob));
+    return frameFor(new UrlMatcher(glob));
  }

  @Override
@@ -710,11 +748,6 @@ public class PageImpl extends ChannelOwner implements Page {
    return frameFor(new UrlMatcher(predicate));
  }

-  @Override
-  public FrameLocator frameLocator(String selector) {
-    return mainFrame.frameLocator(selector);
-  }
-
  private Frame frameFor(UrlMatcher matcher) {
    for (Frame frame : frames) {
      if (matcher.test(frame.url())) {
@@ -732,83 +765,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
@@ -847,41 +804,32 @@ 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)));
-  }
-
-  @Override
-  public void dragAndDrop(String source, String target, DragAndDropOptions options) {
-    withLogging("Page.dragAndDrop", () -> mainFrame.dragAndDropImpl(source, target, convertType(options, Frame.DragAndDropOptions.class)));
+    withLogging("Page.hover", () ->
+      mainFrame.hoverImpl(selector, convertViaJson(options, Frame.HoverOptions.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)));
-  }
-
-  @Override
-  public String inputValue(String selector, InputValueOptions options) {
-    return withLogging("Page.inputValue",
-      () -> mainFrame.inputValueImpl(selector, convertType(options, Frame.InputValueOptions.class)));
+      () -> mainFrame.innerTextImpl(selector, convertViaJson(options, Frame.InnerTextOptions.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
@@ -892,31 +840,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
@@ -924,11 +872,6 @@ public class PageImpl extends ChannelOwner implements Page {
    return keyboard;
  }

-  @Override
-  public Locator locator(String selector, LocatorOptions options) {
-    return mainFrame.locator(selector, convertType(options, Frame.LocatorOptions.class));
-  }
-
  @Override
  public Frame mainFrame() {
    return mainFrame;
@@ -950,7 +893,7 @@ public class PageImpl extends ChannelOwner implements Page {
  @Override
  public void pause() {
    withLogging("BrowserContext.pause", () -> {
-      new WaitableRace<>(asList(context().pause(), (Waitable<JsonElement>) waitableClosedOrCrashed)).get();
+      context().pause();
    });
  }

@@ -979,7 +922,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
@@ -987,11 +930,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();
@@ -1005,38 +943,23 @@ public class PageImpl extends ChannelOwner implements Page {
  }

  @Override
-  public void route(String url, Consumer<Route> handler, RouteOptions options) {
-    route(new UrlMatcher(browserContext.baseUrl, url), handler, options);
+  public void route(String url, Consumer<Route> handler) {
+    route(new UrlMatcher(url), handler);
  }

  @Override
-  public void route(Pattern url, Consumer<Route> handler, RouteOptions options) {
-    route(new UrlMatcher(url), handler, options);
+  public void route(Pattern url, Consumer<Route> handler) {
+    route(new UrlMatcher(url), handler);
  }

  @Override
-  public void route(Predicate<String> url, Consumer<Route> handler, RouteOptions options) {
-    route(new UrlMatcher(url), handler, options);
+  public void route(Predicate<String> url, Consumer<Route> handler) {
+    route(new UrlMatcher(url), handler);
  }

-  @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) {
+  private void route(UrlMatcher matcher, Consumer<Route> handler) {
    withLogging("Page.route", () -> {
-      routes.add(matcher, handler, options == null ? null : options.times);
+      routes.add(matcher, handler);
      if (routes.size() == 1) {
        JsonObject params = new JsonObject();
        params.addProperty("enabled", true);
@@ -1050,6 +973,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 };
@@ -1064,8 +989,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
@@ -1091,18 +1019,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());
@@ -1115,25 +1033,19 @@ 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)));
-  }
-
-  @Override
-  public void setChecked(String selector, boolean checked, SetCheckedOptions options) {
-    withLogging("Page.setChecked",
-      () -> mainFrame.setCheckedImpl(selector, checked, convertType(options, Frame.SetCheckedOptions.class)));
+      () -> mainFrame.selectOptionImpl(selector, values, convertViaJson(options, Frame.SelectOptionOptions.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
@@ -1180,7 +1092,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
@@ -1191,7 +1103,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
@@ -1207,13 +1119,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
@@ -1229,18 +1141,18 @@ 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
  public void unroute(String url, Consumer<Route> handler) {
-    unroute(new UrlMatcher(browserContext.baseUrl, url), handler);
+    unroute(new UrlMatcher(url), handler);
  }

  @Override
@@ -1256,18 +1168,14 @@ public class PageImpl extends ChannelOwner implements Page {
  private void unroute(UrlMatcher matcher, Consumer<Route> handler) {
    withLogging("Page.unroute", () -> {
      routes.remove(matcher, handler);
-      maybeDisableNetworkInterception();
+      if (routes.size() == 0) {
+        JsonObject params = new JsonObject();
+        params.addProperty("enabled", false);
+        sendMessage("setNetworkInterceptionEnabled", params);
+      }
    });
  }

-  private void maybeDisableNetworkInterception() {
-    if (routes.size() == 0) {
-      JsonObject params = new JsonObject();
-      params.addProperty("enabled", false);
-      sendMessage("setNetworkInterceptionEnabled", params);
-    }
-  }
-
  @Override
  public String url() {
    return mainFrame.url();
@@ -1308,30 +1216,28 @@ 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);
-      return null;
-    });
+    withLogging("Page.waitForLoadState",
+      () -> mainFrame.waitForLoadStateImpl(state, convertViaJson(options, Frame.WaitForLoadStateOptions.class)));
  }

  @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) {
@@ -1383,86 +1289,70 @@ 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(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) {
    if (options == null) {
      options = new WaitForRequestOptions();
    }
-    return waitForEventWithTimeout(EventType.REQUEST, code, predicate, options.timeout);
-  }
-
-  @Override
-  public Request waitForRequestFinished(WaitForRequestFinishedOptions options, Runnable code) {
-    return withWaitLogging("Page.waitForRequestFinished", logger -> waitForRequestFinishedImpl(options, code));
-  }
-
-  private Request waitForRequestFinishedImpl(WaitForRequestFinishedOptions options, Runnable code) {
-    if (options == null) {
-      options = new WaitForRequestFinishedOptions();
-    }
-    return waitForEventWithTimeout(EventType.REQUESTFINISHED, code, options.predicate, options.timeout);
+    List<Waitable<Request>> waitables = new ArrayList<>();
+    waitables.add(new WaitableEvent<>(listeners, EventType.REQUEST,
+      request -> predicate == null || predicate.test(request)));
+    waitables.add(createWaitForCloseHelper());
+    waitables.add(createWaitableTimeout(options.timeout));
+    return runUntil(code, new WaitableRace<>(waitables));
  }

  @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(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) {
    if (options == null) {
      options = new WaitForResponseOptions();
    }
-    return waitForEventWithTimeout(EventType.RESPONSE, code, predicate, options.timeout);
+    List<Waitable<Response>> waitables = new ArrayList<>();
+    waitables.add(new WaitableEvent<>(listeners, EventType.RESPONSE,
+      response -> predicate == null || predicate.test(response)));
+    waitables.add(createWaitForCloseHelper());
+    waitables.add(createWaitableTimeout(options.timeout));
+    return runUntil(code, new WaitableRace<>(waitables));
  }

  @Override
  public ElementHandle waitForSelector(String selector, WaitForSelectorOptions options) {
    return withLogging("Page.waitForSelector",
-      () -> mainFrame.waitForSelectorImpl(selector, convertType(options, Frame.WaitForSelectorOptions.class)));
+      () -> mainFrame.waitForSelectorImpl(selector, convertViaJson(options, Frame.WaitForSelectorOptions.class)));
  }

  @Override
@@ -1472,7 +1362,7 @@ public class PageImpl extends ChannelOwner implements Page {

  @Override
  public void waitForURL(String url, WaitForURLOptions options) {
-    waitForURL(new UrlMatcher(browserContext.baseUrl, url), options);
+    waitForURL(new UrlMatcher(url), options);
  }

  @Override
@@ -1486,10 +1376,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
@@ -15,7 +15,6 @@
 */
 package com.microsoft.playwright.impl;

-import com.google.gson.JsonObject;
 import com.microsoft.playwright.PlaywrightException;

 import java.io.*;
@@ -25,10 +24,8 @@ import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.TimeUnit;

-import static com.microsoft.playwright.impl.Serialization.gson;
-
 public class PipeTransport implements Transport {
-  private final BlockingQueue<JsonObject> incoming = new ArrayBlockingQueue<>(1000);
+  private final BlockingQueue<String> incoming = new ArrayBlockingQueue<>(1000);
  private final BlockingQueue<String> outgoing= new ArrayBlockingQueue<>(1000);

  private final ReaderThread readerThread;
@@ -45,27 +42,24 @@ public class PipeTransport implements Transport {
  }

  @Override
-  public void send(JsonObject message) {
+  public void send(String message) {
    if (isClosed) {
      throw new PlaywrightException("Playwright connection closed");
    }
    try {
-      // We could serialize the message on the IO thread but there is no guarantee
-      // that the message object won't be modified on this thread after it's added
-      // to the queue.
-      outgoing.put(gson().toJson(message));
+      outgoing.put(message);
    } catch (InterruptedException e) {
      throw new PlaywrightException("Failed to send message", e);
    }
  }

  @Override
-  public JsonObject poll(Duration timeout) {
+  public String poll(Duration timeout) {
    if (isClosed) {
      throw new PlaywrightException("Playwright connection closed");
    }
    try {
-      JsonObject message = incoming.poll(timeout.toMillis(), TimeUnit.MILLISECONDS);
+      String message = incoming.poll(timeout.toMillis(), TimeUnit.MILLISECONDS);
      if (message == null && readerThread.exception != null) {
        try {
          close();
@@ -97,7 +91,7 @@ public class PipeTransport implements Transport {

 class ReaderThread extends Thread {
  private final DataInputStream in;
-  private final BlockingQueue<JsonObject> queue;
+  private final BlockingQueue<String> queue;
  volatile boolean isClosing;
  volatile Exception exception;

@@ -113,7 +107,7 @@ class ReaderThread extends Thread {
    }
  }

-  ReaderThread(DataInputStream in, BlockingQueue<JsonObject> queue) {
+  ReaderThread(DataInputStream in, BlockingQueue<String> queue) {
    this.in = in;
    this.queue = queue;
  }
@@ -122,8 +116,7 @@ class ReaderThread extends Thread {
  public void run() {
    while (!isInterrupted()) {
      try {
-        JsonObject message = gson().fromJson(readMessage(), JsonObject.class);
-        queue.put(message);
+        queue.put(readMessage());
      } catch (IOException e) {
        if (!isInterrupted() && !isClosing) {
          exception = e;
@@ -17,44 +17,39 @@
 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.util.Collections;
-import java.util.Map;
+import java.nio.file.Path;
 import java.util.concurrent.TimeUnit;

 public class PlaywrightImpl extends ChannelOwner implements Playwright {
  private Process driverProcess;
+  private StreamRedirectThread stderrThread;

-  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);
+  public static PlaywrightImpl create() {
+    StreamRedirectThread stderrThread = null;
    try {
-      ProcessBuilder pb = driver.createProcessBuilder();
-      pb.command().add("run-driver");
-      pb.redirectError(ProcessBuilder.Redirect.INHERIT);
+      Path driver = Driver.ensureDriverInstalled();
+      ProcessBuilder pb = new ProcessBuilder(driver.toString(), "run-driver");
+//      pb.environment().put("DEBUG", "pw:pro*");
      Process p = pb.start();
-      Connection connection = new Connection(new PipeTransport(p.getInputStream(), p.getOutputStream()), env);
-      PlaywrightImpl result = connection.initializePlaywright();
+      stderrThread = new StreamRedirectThread(p.getErrorStream(), System.err);
+      Connection connection = new Connection(new PipeTransport(p.getInputStream(), p.getOutputStream()));
+      PlaywrightImpl result = (PlaywrightImpl) connection.waitForObjectWithKnownName("Playwright");
      result.driverProcess = p;
+      result.stderrThread = stderrThread;
+      stderrThread = null;
      result.initSharedSelectors(null);
      return result;
    } catch (IOException e) {
      throw new PlaywrightException("Failed to launch driver", e);
+    } finally {
+      if (stderrThread != null) {
+        stderrThread.terminateAndJoin();
+      }
    }
  }

@@ -62,9 +57,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 +66,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 +92,6 @@ public class PlaywrightImpl extends ChannelOwner implements Playwright {
    return firefox;
  }

-  @Override
-  public APIRequest request() {
-    return apiRequest;
-  }
-
  @Override
  public BrowserTypeImpl webkit() {
    return webkit;
@@ -128,6 +111,7 @@ public class PlaywrightImpl extends ChannelOwner implements Playwright {
      if (!didClose) {
        System.err.println("WARNING: Timed out while waiting for driver process to exit");
      }
+      stderrThread.terminateAndJoin();
    } catch (IOException e) {
      throw new PlaywrightException("Failed to terminate", e);
    } catch (InterruptedException e) {
@@ -18,12 +18,18 @@

 package com.microsoft.playwright.impl;

-import java.util.List;
+class Binary {
+}

 class Channel {
  String guid;
 }

+class Metadata{
+  String stack;
+}
+
+
 class SerializedValue{
  Number n;
  Boolean b;
@@ -31,7 +37,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,15 +49,47 @@ class SerializedValue{
  }
  O[] o;
  Number h;
-  Integer id;
-  Integer ref;
 }

+
 class SerializedArgument{
  SerializedValue value;
  Channel[] handles;
 }

+class AXNode{
+  String role;
+  String name;
+  String valueString;
+  Number valueNumber;
+  String description;
+  String keyshortcuts;
+  String roledescription;
+  String valuetext;
+  Boolean disabled;
+  Boolean expanded;
+  Boolean focused;
+  Boolean modal;
+  Boolean multiline;
+  Boolean multiselectable;
+  Boolean readonly;
+  Boolean required;
+  Boolean selected;
+  // Possible values: { 'checked, 'unchecked, 'mixed }
+  String checked;
+  // Possible values: { 'pressed, 'released, 'mixed }
+  String pressed;
+  Number level;
+  Number valuemin;
+  Number valuemax;
+  String autocomplete;
+  String haspopup;
+  String invalid;
+  String orientation;
+  AXNode[] children;
+}
+
+
 class SerializedError{
  public static class Error {
    String message;
@@ -82,29 +119,3 @@ class SerializedError{
  }
 }

-class ExpectedTextValue {
-  String string;
-  String regexSource;
-  String regexFlags;
-  Boolean ignoreCase;
-  Boolean matchSubstring;
-  Boolean normalizeWhiteSpace;
-}
-
-class FrameExpectOptions {
-  Object expressionArg;
-  List<ExpectedTextValue> expectedText;
-  Integer expectedNumber;
-  SerializedArgument expectedValue;
-  Boolean useInnerText;
-  boolean isNot;
-  Double timeout;
-}
-
-class FrameExpectResult {
-  boolean matches;
-  SerializedValue received;
-  List<String> log;
-}
-
-
@@ -1,67 +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.HttpHeader;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-class RawHeaders {
-  private final List<HttpHeader> headersArray;
-  private final Map<String, List<String>> headersMap = new LinkedHashMap<>();
-
-  RawHeaders(List<HttpHeader> headers) {
-    headersArray = headers;
-    for (HttpHeader h: headers) {
-      String name = h.name.toLowerCase();
-      List<String> values = headersMap.get(name);
-      if (values == null) {
-        values = new ArrayList<>();
-        headersMap.put(name, values);
-      }
-      values.add(h.value);
-    }
-  }
-
-  String get(String name) {
-    List<String> values = getAll(name);
-    if (values == null) {
-      return null;
-    }
-    return String.join("set-cookie".equals(name.toLowerCase()) ? "\n" : ", ", values);
-  }
-
-  List<String> getAll(String name) {
-    return headersMap.get(name.toLowerCase());
-  }
-
-  Map<String, String> headers() {
-    Map<String, String> result = new LinkedHashMap<>();
-    for (String name: headersMap.keySet()) {
-      result.put(name, get(name));
-    }
-    return result;
-  }
-
-  List<HttpHeader> headersArray() {
-    return headersArray;
-  }
-
-}
@@ -16,40 +16,25 @@

 package com.microsoft.playwright.impl;

-import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
-import com.microsoft.playwright.PlaywrightException;
+import com.microsoft.playwright.Frame;
 import com.microsoft.playwright.Request;
-import com.microsoft.playwright.options.HttpHeader;
-import com.microsoft.playwright.options.Sizes;
+import com.microsoft.playwright.Response;
 import com.microsoft.playwright.options.Timing;

 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
-import java.util.List;
+import java.util.HashMap;
 import java.util.Map;

-import static com.microsoft.playwright.impl.Serialization.gson;
-import static com.microsoft.playwright.impl.Utils.toHeadersMap;
-import static java.util.Arrays.asList;
-
 public class RequestImpl extends ChannelOwner implements Request {
  private final byte[] postData;
  private RequestImpl redirectedFrom;
  private RequestImpl redirectedTo;
-  private final RawHeaders headers;
-  private RawHeaders rawHeaders;
+  final Map<String, String> headers = new HashMap<>();
  String failure;
  Timing timing;
-  boolean didFailOrFinish;
-  private FallbackOverrides fallbackOverrides;
-
-  static class FallbackOverrides {
-    String url;
-    String method;
-    byte[] postData;
-    Map<String, String> headers;
-  }

  RequestImpl(ChannelOwner parent, String type, String guid, JsonObject initializer) {
    super(parent, type, guid, initializer);
@@ -58,7 +43,10 @@ public class RequestImpl extends ChannelOwner implements Request {
      redirectedFrom = connection.getExistingObject(initializer.getAsJsonObject("redirectedFrom").get("guid").getAsString());
      redirectedFrom.redirectedTo = this;
    }
-    headers = new RawHeaders(asList(gson().fromJson(initializer.getAsJsonArray("headers"), HttpHeader[].class)));
+    for (JsonElement e : initializer.getAsJsonArray("headers")) {
+      JsonObject item = e.getAsJsonObject();
+      headers.put(item.get("name").getAsString().toLowerCase(), item.get("value").getAsString());
+    }
    if (initializer.has("postData")) {
      postData = Base64.getDecoder().decode(initializer.get("postData").getAsString());
    } else {
@@ -66,37 +54,19 @@ public class RequestImpl extends ChannelOwner implements Request {
    }
  }

-  @Override
-  public Map<String, String> allHeaders() {
-    return withLogging("Request.allHeaders", () -> getRawHeaders().headers());
-  }
-
  @Override
  public String failure() {
    return failure;
  }

  @Override
-  public FrameImpl frame() {
+  public Frame frame() {
    return connection.getExistingObject(initializer.getAsJsonObject("frame").get("guid").getAsString());
  }

  @Override
  public Map<String, String> headers() {
-    if (fallbackOverrides != null && fallbackOverrides.headers != null) {
-      return new RawHeaders(Utils.toHeadersList(fallbackOverrides.headers)).headers();
-    }
-    return headers.headers();
-  }
-
-  @Override
-  public List<HttpHeader> headersArray() {
-    return withLogging("Request.headersArray", () -> getRawHeaders().headersArray());
-  }
-
-  @Override
-  public String headerValue(String name) {
-    return withLogging("Request.headerValue", () -> getRawHeaders().get(name));
+    return headers;
  }

  @Override
@@ -106,26 +76,19 @@ public class RequestImpl extends ChannelOwner implements Request {

  @Override
  public String method() {
-    if (fallbackOverrides != null && fallbackOverrides.method != null) {
-      return fallbackOverrides.method;
-    }
    return initializer.get("method").getAsString();
  }

  @Override
  public String postData() {
-    byte[] buffer = postDataBuffer();
-    if (buffer == null) {
+    if (postData == null) {
      return null;
    }
-    return new String(buffer, StandardCharsets.UTF_8);
+    return new String(postData, StandardCharsets.UTF_8);
  }

  @Override
  public byte[] postDataBuffer() {
-    if (fallbackOverrides != null && fallbackOverrides.postData != null) {
-      return fallbackOverrides.postData;
-    }
    return postData;
  }

@@ -145,7 +108,7 @@ public class RequestImpl extends ChannelOwner implements Request {
  }

  @Override
-  public ResponseImpl response() {
+  public Response response() {
    return withLogging("Request.response", () -> {
      JsonObject result = sendMessage("response").getAsJsonObject();
      if (!result.has("response")) {
@@ -155,18 +118,6 @@ public class RequestImpl extends ChannelOwner implements Request {
    });
  }

-  @Override
-  public Sizes sizes() {
-    return withLogging("Request.sizes", () -> {
-      ResponseImpl response = response();
-      if (response == null) {
-        throw new PlaywrightException("Unable to fetch sizes for failed request");
-      }
-      JsonObject json = response.sendMessage("sizes").getAsJsonObject();
-      return gson().fromJson(json.getAsJsonObject("sizes"), Sizes.class);
-    });
-  }
-
  @Override
  public Timing timing() {
    return timing;
@@ -174,9 +125,6 @@ public class RequestImpl extends ChannelOwner implements Request {

  @Override
  public String url() {
-    if (fallbackOverrides != null && fallbackOverrides.url != null) {
-      return fallbackOverrides.url;
-    }
    return initializer.get("url").getAsString();
  }

@@ -184,42 +132,4 @@ public class RequestImpl extends ChannelOwner implements Request {
    return redirectedTo != null ? redirectedTo.finalRequest() : this;
  }

-  private RawHeaders getRawHeaders() {
-    if (fallbackOverrides != null && fallbackOverrides.headers != null) {
-      return new RawHeaders(Utils.toHeadersList(fallbackOverrides.headers));
-    }
-    if (rawHeaders != null) {
-      return rawHeaders;
-    }
-    JsonArray rawHeadersJson = withLogging("Request.allHeaders", () -> {
-      JsonObject result = sendMessage("rawRequestHeaders").getAsJsonObject();
-      return result.getAsJsonArray("headers");
-    });
-
-    // The field may have been initialized in a nested call but it is ok.
-    rawHeaders = new RawHeaders(asList(gson().fromJson(rawHeadersJson, HttpHeader[].class)));
-    return rawHeaders;
-  }
-
-  void applyFallbackOverrides(FallbackOverrides overrides) {
-    if (fallbackOverrides == null) {
-      fallbackOverrides = new FallbackOverrides();
-    }
-    if (overrides.url != null) {
-      fallbackOverrides.url = overrides.url;
-    }
-    if (overrides.method != null) {
-      fallbackOverrides.method = overrides.method;
-    }
-    if (overrides.headers != null) {
-      fallbackOverrides.headers = overrides.headers;
-    }
-    if (overrides.postData != null) {
-      fallbackOverrides.postData = overrides.postData;
-    }
-  }
-
-  FallbackOverrides fallbackOverridesForResume() {
-    return fallbackOverrides;
-  }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Yury Semikhatsky	74bf6637f3	fix: remove stray logging (#435 )	2021-05-07 16:30:12 -07:00
Yury Semikhatsky	7f3ecd83b9	chore(release): set version to 1.11.0 (#431 )	2021-05-07 11:17:54 -07:00