devops: fix docker publish workflow (#898 ) (#900 )

fix: get docker version from pom.xml (#899 )
chore: roll release 1.21.0 driver (#896 )
2026-05-23 03:03:15 +00:00 · 2022-04-12 12:09:47 -07:00 · 2022-04-12 12:08:26 -07:00 · 2022-04-12 10:46:14 -07:00 · 2022-04-12 10:30:12 -07:00
317 changed files with 9283 additions and 32168 deletions
@@ -1,115 +0,0 @@
-{
-  "hydrated": false,
-  "properties": {
-    "helpUri": "https://eng.ms/docs/microsoft-security/security/azure-security/cloudai-security-fundamentals-engineering/security-integration/guardian-wiki/microsoft-guardian/general/suppressions",
-    "hydrationStatus": "This file does not contain identifying data. It is safe to check into your repo. To hydrate this file with identifying data, run `guardian hydrate --help` and follow the guidance."
-  },
-  "version": "1.0.0",
-  "suppressionSets": {
-    "default": {
-      "name": "default",
-      "createdDate": "2024-02-06 20:37:57Z",
-      "lastUpdatedDate": "2024-02-06 20:37:57Z"
-    }
-  },
-  "results": {
-    "de854c6ab9b27b1ec642cec1a51059b92f88815a231c1c8f4b8e71d9e378f174": {
-      "signature": "de854c6ab9b27b1ec642cec1a51059b92f88815a231c1c8f4b8e71d9e378f174",
-      "alternativeSignatures": [
-        "79827cf2e75a7f99eec716562fb9fa0d49014ac96b7afc76d29d79a33e8edd94"
-      ],
-      "memberOf": [
-        "default"
-      ],
-      "createdDate": "2024-02-06 20:37:57Z"
-    },
-    "ebe0026db71ae4bb2d8e76b706198003079a5c095658de8dd49e67f7e572ea46": {
-      "signature": "ebe0026db71ae4bb2d8e76b706198003079a5c095658de8dd49e67f7e572ea46",
-      "alternativeSignatures": [],
-      "memberOf": [
-        "default"
-      ],
-      "createdDate": "2024-02-06 20:37:57Z"
-    },
-    "bb02ef965dce40b6c950b6d0cf8a9f41c08c5e33f17268fb208f3687b11ffa26": {
-      "signature": "bb02ef965dce40b6c950b6d0cf8a9f41c08c5e33f17268fb208f3687b11ffa26",
-      "alternativeSignatures": [
-        "3a8630eaccc2c5c39ae78836bb115bf55557058bad206fdad7dbe4f0ae466ed1"
-      ],
-      "memberOf": [
-        "default"
-      ],
-      "createdDate": "2024-02-06 20:37:57Z"
-    },
-    "dffa3e24f6dc7542d741b2fab22eec657aca441a51cee515ca9bb4932995a416": {
-      "signature": "dffa3e24f6dc7542d741b2fab22eec657aca441a51cee515ca9bb4932995a416",
-      "alternativeSignatures": [
-        "56a4b454840e2c21d44a76d9ab09fde76fba682ce7508a3f6abf7b411d389e56"
-      ],
-      "memberOf": [
-        "default"
-      ],
-      "createdDate": "2024-02-06 20:37:57Z"
-    },
-    "5dbcaaac8cdccc6df557cbde94e5d7e0f1c8a67546ba82a1b85b629030f3d311": {
-      "signature": "5dbcaaac8cdccc6df557cbde94e5d7e0f1c8a67546ba82a1b85b629030f3d311",
-      "alternativeSignatures": [
-        "fdb8e8af8d5697f767d0e55194f91d4a089d981555e00d058ba866acb8602014"
-      ],
-      "memberOf": [
-        "default"
-      ],
-      "createdDate": "2024-02-06 20:37:57Z"
-    },
-    "b7db026b2a60bdb63af1c0938ac16d9414bb4d38e9efdc51626e12aa55f6b72f": {
-      "signature": "b7db026b2a60bdb63af1c0938ac16d9414bb4d38e9efdc51626e12aa55f6b72f",
-      "alternativeSignatures": [
-        "bf7bb897e644659827d8dc8d55f719296d3ab94dc750b666ce90d8057361d9d5"
-      ],
-      "memberOf": [
-        "default"
-      ],
-      "createdDate": "2024-02-06 20:37:57Z"
-    },
-    "aa702d85554c352e3016e3ec3d790df489833dc97e3733c58b57915ec125f47b": {
-      "signature": "aa702d85554c352e3016e3ec3d790df489833dc97e3733c58b57915ec125f47b",
-      "alternativeSignatures": [
-        "948787329d52a66b4691383c81af407b03e68344a6685bbab3cfa8eb8db34f81"
-      ],
-      "memberOf": [
-        "default"
-      ],
-      "createdDate": "2024-02-06 20:37:57Z"
-    },
-    "38174b5c9b474c3c0278d4c4173c14022e03dec3dc4db5ced51d2ca8459e7f2a": {
-      "signature": "38174b5c9b474c3c0278d4c4173c14022e03dec3dc4db5ced51d2ca8459e7f2a",
-      "alternativeSignatures": [
-        "a9efa99679f3966da96a8b89f1250576cfceda774556d43ea89ea84289967276"
-      ],
-      "memberOf": [
-        "default"
-      ],
-      "createdDate": "2024-02-06 20:37:57Z"
-    },
-    "08a4e1be4662d897e5b2b7a7dc6d6901405462cd2d5f8ad433c13e12a8503fb6": {
-      "signature": "08a4e1be4662d897e5b2b7a7dc6d6901405462cd2d5f8ad433c13e12a8503fb6",
-      "alternativeSignatures": [
-        "009132f89939956a3f4471bb13353394015c9a7e675d118aa427e75f05658e05"
-      ],
-      "memberOf": [
-        "default"
-      ],
-      "createdDate": "2024-02-06 20:37:57Z"
-    },
-    "551d69737553150380e58bc9a8ae1e8f17da931561ea4e195781fb8cad225188": {
-      "signature": "551d69737553150380e58bc9a8ae1e8f17da931561ea4e195781fb8cad225188",
-      "alternativeSignatures": [
-        "617ad56322c5fb82a162b0b583e676d66a8e76b0d444aaab487865e4bf89e83b"
-      ],
-      "memberOf": [
-        "default"
-      ],
-      "createdDate": "2024-02-06 20:37:57Z"
-    }
-  }
-}
@@ -1,77 +0,0 @@
-trigger: none
-pr: none
-
-resources:
-  repositories:
-  - repository: 1esPipelines
-    type: git
-    name: 1ESPipelineTemplates/1ESPipelineTemplates
-    ref: refs/tags/release
-
-extends:
-  template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
-  parameters:
-    pool:
-      name: DevDivPlaywrightAzurePipelinesUbuntu2204
-      os: linux
-    sdl:
-      sourceAnalysisPool:
-        name: DevDivPlaywrightAzurePipelinesWindows2022
-        # The image must be windows-based due to restrictions of the SDL tools. See: https://aka.ms/AAo6v8e
-        # In the case of a windows build, this can be the same as the above pool image.
-        os: windows
-      suppression:
-        suppressionFile: $(Build.SourcesDirectory)\.azure-pipelines\guardian\SDL\.gdnsuppress
-    stages:
-    - stage: Stage
-      jobs:
-      - job: HostJob
-        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.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
-        
-        - task: EsrpRelease@7
-          inputs:
-            connectedservicename: 'Playwright-ESRP-Azure'
-            keyvaultname: 'pw-publishing-secrets'
-            authcertname: 'ESRP-Release-Auth'
-            signcertname: 'ESRP-Release-Sign'
-            clientid: '13434a40-7de4-4c23-81a3-d843dc81c2c5'
-            intent: 'PackageDistribution'
-            contenttype: 'Maven'
-            # Keeping it commented out as a workaround for:
-            # https://portal.microsofticm.com/imp/v3/incidents/incident/499972482/summary
-            # contentsource: 'folder'
-            folderlocation: './local-build'
-            waitforreleasecompletion: true
-            owners: 'yurys@microsoft.com'
-            approvers: 'maxschmitt@microsoft.com'
-            serviceendpointurl: 'https://api.esrp.microsoft.com'
-            mainpublisher: 'Playwright'
-            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
@@ -0,0 +1,41 @@
+---
+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,95 +0,0 @@
-name: Bug Report 🪲
-description: Create a bug report to help us improve
-title: '[Bug]: '
-body:
-  - type: markdown
-    attributes:
-      value: |
-        # Please follow these steps first:
-  - type: markdown
-    attributes:
-      value: |
-        ## Troubleshoot
-        If Playwright is not behaving the way you expect, we'd ask you to look at the [documentation](https://playwright.dev/java/docs/intro) and search the issue tracker for evidence supporting your expectation.
-        Please make reasonable efforts to troubleshoot and rule out issues with your code, the configuration, or any 3rd party libraries you might be using.
-        Playwright offers [several debugging tools](https://playwright.dev/java/docs/debug) that you can use to troubleshoot your issues.
-  - type: markdown
-    attributes:
-      value: |
-        ## Ask for help through appropriate channels
-        If you feel unsure about the cause of the problem, consider asking for help on for example [StackOverflow](https://stackoverflow.com/questions/ask) or our [Discord channel](https://aka.ms/playwright/discord) before posting a bug report. The issue tracker is not a help forum.
-  - type: markdown
-    attributes:
-      value: |
-        ## Make a minimal reproduction
-        To file the report, you will need a GitHub repository with a minimal (but complete) example and simple/clear steps on how to reproduce the bug.
-        The simpler you can make it, the more likely we are to successfully verify and fix the bug.
-  - type: markdown
-    attributes:
-      value: |
-        > [!IMPORTANT]
-        > Bug reports without a minimal reproduction will be rejected.
-
-        ---
-  - type: input
-    id: version
-    attributes:
-      label: Version
-      description: |
-        The version of Playwright you are using.
-        Is it the [latest](https://github.com/microsoft/playwright-java/releases)? Test and see if the bug has already been fixed.
-      placeholder: ex. 1.41.1
-    validations:
-      required: true
-  - type: textarea
-    id: reproduction
-    attributes:
-      label: Steps to reproduce
-      description: Please link to a repository with a minimal reproduction and describe accurately how we can reproduce/verify the bug.
-      placeholder: |
-        Example steps (replace with your own):
-        1. Clone my repo at https://github.com/<myuser>/example
-        2. mvn test
-        3. You should see the error come up
-    validations:
-      required: true
-  - type: textarea
-    id: expected
-    attributes:
-      label: Expected behavior
-      description: A description of what you expect to happen.
-      placeholder: I expect to see X or Y
-    validations:
-      required: true
-  - type: textarea
-    id: what-happened
-    attributes:
-      label: Actual behavior
-      description: |
-        A clear and concise description of the unexpected behavior.
-        Please include any relevant output here, especially any error messages.
-      placeholder: A bug happened!
-    validations:
-      required: true
-  - type: textarea
-    id: context
-    attributes:
-      label: Additional context
-      description: Anything else that might be relevant
-    validations:
-      required: false
-  - type: textarea
-    id: envinfo
-    attributes:
-      label: Environment
-      description: |
-        Please provide information about the environment you are running in.
-      placeholder: |
-        - Operating System: [Ubuntu 22.04]
-        - CPU: [arm64]
-        - Browser: [All, Chromium, Firefox, WebKit]
-        - Java Version: [20]
-        - Maven Version: [3.8.6]
-        - Other info:
-    validations:
-      required: true
@@ -1,5 +1,4 @@
-blank_issues_enabled: false
 contact_links:
-  - name: Join our Discord Server
-    url: https://aka.ms/playwright/discord
-    about: Ask questions and discuss with other community members
+  - name: Join our Slack community
+    url: https://aka.ms/playwright-slack
+    about: Ask questions and discuss with other community members
@@ -1,29 +0,0 @@
-name: Documentation 📖
-description: Submit a request to add or update documentation
-title: '[Docs]: '
-labels: ['Documentation :book:']
-body:
-  - type: markdown
-    attributes:
-      value: |
-        ### Thank you for helping us improve our documentation!
-        Please be sure you are looking at [the Next version of the documentation](https://playwright.dev/java/docs/next/intro) before opening an issue here.
-  - type: textarea
-    id: links
-    attributes:
-      label: Page(s)
-      description: |
-        Links to one or more documentation pages that should be modified.
-        If you are reporting an issue with a specific section of a page, try to link directly to the nearest anchor.
-        If you are suggesting that a new page be created, link to the parent of the proposed page.
-    validations:
-      required: true
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-      description: |
-        Describe the change you are requesting.
-        If the issue pertains to a single function or matcher, be sure to specify the entire call signature.
-    validations:
-      required: true
@@ -1,30 +0,0 @@
-name: Feature Request 🚀
-description: Submit a proposal for a new feature
-title: '[Feature]: '
-body:
-  - type: markdown
-    attributes:
-      value: |
-        ### Thank you for taking the time to suggest a new feature!
-  - type: textarea
-    id: description
-    attributes:
-      label: '🚀 Feature Request'
-      description: A clear and concise description of what the feature is.
-    validations:
-      required: true
-  - type: textarea
-    id: example
-    attributes:
-      label: Example
-      description: Describe how this feature would be used.
-    validations:
-      required: false
-  - type: textarea
-    id: motivation
-    attributes:
-      label: Motivation
-      description: |
-        Outline your motivation for the proposal. How will it make Playwright better?
-    validations:
-      required: true
@@ -0,0 +1,11 @@
+---
+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?
@@ -0,0 +1,10 @@
+---
+name: I have a question
+about: Feel free to ask us your questions!
+title: "[Question]"
+labels: ''
+assignees: ''
+
+---
+
+
@@ -1,27 +0,0 @@
-name: 'Questions / Help 💬'
-description: If you have questions, please check StackOverflow or Discord
-title: '[Please read the message below]'
-labels: [':speech_balloon: Question']
-body:
-  - type: markdown
-    attributes:
-      value: |
-        ## Questions and Help 💬
-
-        This issue tracker is reserved for bug reports and feature requests.
-
-        For anything else, such as questions or getting help, please see:
-
-        - [The Playwright documentation](https://playwright.dev/java)
-        - [Our Discord server](https://aka.ms/playwright/discord)
-  - type: checkboxes
-    id: no-post
-    attributes:
-      label: |
-        Please do not submit this issue.
-      description: |
-        > [!IMPORTANT]
-        > This issue will be closed.
-      options:
-        - label: I understand
-          required: true
@@ -0,0 +1,38 @@
+---
+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.
@@ -1,90 +0,0 @@
-name: Report regression
-description: Functionality that used to work and does not any more
-title: "[Regression]: "
-body:
-  - type: markdown
-    attributes:
-      value: |
-        # Please follow these steps first:
-  - type: markdown
-    attributes:
-      value: |
-        ## Make a minimal reproduction
-        To file the report, you will need a GitHub repository with a minimal (but complete) example and simple/clear steps on how to reproduce the regression.
-        The simpler you can make it, the more likely we are to successfully verify and fix the regression.
-  - type: markdown
-    attributes:
-      value: |
-        > [!IMPORTANT]
-        > Regression reports without a minimal reproduction will be rejected.
-
-        ---
-  - type: input
-    id: goodVersion
-    attributes:
-      label: Last Good Version
-      description: |
-        Last version of Playwright where the feature was working.
-      placeholder: ex. 1.40.1
-    validations:
-      required: true
-  - type: input
-    id: badVersion
-    attributes:
-      label: First Bad Version
-      description: |
-        First version of Playwright where the feature was broken.
-        Is it the [latest](https://github.com/microsoft/playwright-java/releases)? Test and see if the regression has already been fixed.
-      placeholder: ex. 1.41.1
-    validations:
-      required: true
-  - type: textarea
-    id: reproduction
-    attributes:
-      label: Steps to reproduce
-      description: Please link to a repository with a minimal reproduction and describe accurately how we can reproduce/verify the bug.
-      placeholder: |
-        Example steps (replace with your own):
-        1. Clone my repo at https://github.com/<myuser>/example
-        2. mvn test
-        3. You should see the error come up
-    validations:
-      required: true
-  - type: textarea
-    id: expected
-    attributes:
-      label: Expected behavior
-      description: A description of what you expect to happen.
-      placeholder: I expect to see X or Y
-    validations:
-      required: true
-  - type: textarea
-    id: what-happened
-    attributes:
-      label: Actual behavior
-      description: A clear and concise description of the unexpected behavior.
-      placeholder: A bug happened!
-    validations:
-      required: true
-  - type: textarea
-    id: context
-    attributes:
-      label: Additional context
-      description: Anything else that might be relevant
-    validations:
-      required: false
-  - type: textarea
-    id: envinfo
-    attributes:
-      label: Environment
-      description: |
-        Please provide information about the environment you are running in.
-      placeholder: |
-        - Operating System: [Ubuntu 22.04]
-        - CPU: [arm64]
-        - Browser: [All, Chromium, Firefox, WebKit]
-        - Java Version: [20]
-        - Maven Version: [3.8.6]
-        - Other info:
-    validations:
-      required: true
@@ -1,10 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "maven"
-    directory: "/" # Location of the pom.xml file
-    schedule:
-      interval: "weekly"
-    open-pull-requests-limit: 10
-    allow:
-      - dependency-type: "direct" # Optional: Only update direct dependencies
-      - dependency-type: "indirect" # Optional: Only update indirect (transitive) dependencies
@@ -0,0 +1,32 @@
+name: Publish
+on:
+  release:
+    types: [published]
+  push:
+    branches:
+      - main
+jobs:
+  build:
+    timeout-minutes: 30
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: microsoft/playwright-github-action@v1.5.0
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+          server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml
+          server-username: MAVEN_USERNAME # env variable for username in deploy
+          server-password: MAVEN_PASSWORD # env variable for token in deploy
+          gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
+          gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
+      - name: Download drivers
+        shell: bash
+        run: scripts/download_driver_for_all_platforms.sh
+      - name: Publish to Maven Central
+        run: mvn deploy --batch-mode -D skipTests --activate-profiles release --no-transfer-progress
+        env:
+          MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+          MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
+          MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
@@ -0,0 +1,25 @@
+name: "devrelease:docker"
+
+on:
+  push:
+    branches:
+      - main
+jobs:
+  publish-canary-docker:
+    name: "publish to DockerHub"
+    runs-on: ubuntu-20.04
+    if: github.repository == 'microsoft/playwright-java'
+    steps:
+    - uses: actions/checkout@v2
+    - uses: azure/docker-login@v1
+      with:
+        login-server: playwright.azurecr.io
+        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
@@ -8,30 +8,25 @@ on:
        required: true
        type: boolean
        description: "Is this a release image?"
+    branches:
+      - release-*
 jobs:
  publish-canary-docker:
    name: publish to DockerHub
-    runs-on: ubuntu-22.04
-    permissions:
-      id-token: write   # This is required for OIDC login (azure/login) to succeed
-      contents: read    # This is required for actions/checkout to succeed
-    environment: Docker
+    runs-on: ubuntu-20.04
    if: github.repository == 'microsoft/playwright-java'
    steps:
-    - uses: actions/checkout@v4
-    - name: Azure login
-      uses: azure/login@v2
+    - uses: actions/checkout@v2
+    - uses: azure/docker-login@v1
      with:
-        client-id: ${{ secrets.AZURE_DOCKER_CLIENT_ID }}
-        tenant-id: ${{ secrets.AZURE_DOCKER_TENANT_ID }}
-        subscription-id: ${{ secrets.AZURE_DOCKER_SUBSCRIPTION_ID }}
-    - name: Login to ACR via OIDC
-      run: az acr login --name playwright
+        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@v3
+      uses: docker/setup-qemu-action@v1
      with:
        platforms: arm64
-    - uses: actions/checkout@v4
+    - 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
@@ -27,18 +27,22 @@ jobs:
        java-version: 8
    - name: Download drivers
      shell: bash
-      run: scripts/download_driver.sh
+      run: scripts/download_driver_for_all_platforms.sh
    - name: Build & Install
      run: mvn -B install -D skipTests --no-transfer-progress
    - name: Run tests
-      run: mvn test --no-transfer-progress --fail-at-end -D org.slf4j.simpleLogger.showDateTime=true -D org.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss
+      run: mvn test -DexcludedGroups=isolated --no-transfer-progress --fail-at-end
      env:
        BROWSER: ${{ matrix.browser }}
    - name: Run tracing tests w/ sources
-      run: mvn test --no-transfer-progress --fail-at-end --projects=playwright -D test=*TestTracing* -D org.slf4j.simpleLogger.showDateTime=true -D org.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss
+      run: mvn test -DexcludedGroups=isolated --no-transfer-progress --fail-at-end -D test=*TestTracing*
      env:
        BROWSER: ${{ matrix.browser }}
        PLAYWRIGHT_JAVA_SRC: src/test/java
+    - name: Run driver throw tests
+      run: mvn test -Dgroups=driverThrowTest --no-transfer-progress --fail-at-end
+      env:
+        BROWSER: ${{ matrix.browser }}
    - name: Test Spring Boot Starter
      shell: bash
      env:
@@ -75,15 +79,16 @@ jobs:
          java-version: 8
      - name: Download drivers
        shell: bash
-        run: scripts/download_driver.sh
+        run: scripts/download_driver_for_all_platforms.sh
      - name: Build & Install
        run: mvn -B install -D skipTests --no-transfer-progress
-      - name: Install MS Edge
-        if: matrix.browser-channel == 'msedge' && matrix.os == 'macos-latest'
-        shell: bash
-        run: mvn exec:java -e -D exec.mainClass=com.microsoft.playwright.CLI -D exec.args="install msedge" -f playwright/pom.xml 
      - name: Run tests
-        run: mvn test --no-transfer-progress --fail-at-end -D org.slf4j.simpleLogger.showDateTime=true -D org.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss
+        run: mvn test -DexcludedGroups=isolated --no-transfer-progress --fail-at-end
+        env:
+          BROWSER: chromium
+          BROWSER_CHANNEL: ${{ matrix.browser-channel }}
+      - name: Run driver throw tests
+        run: mvn test -Dgroups=driverThrowTest --no-transfer-progress --fail-at-end
        env:
          BROWSER: chromium
          BROWSER_CHANNEL: ${{ matrix.browser-channel }}
@@ -105,7 +110,7 @@ jobs:
          java-version: 17
      - name: Download drivers
        shell: bash
-        run: scripts/download_driver.sh
+        run: scripts/download_driver_for_all_platforms.sh
      - name: Build & Install
        run: mvn -B install -D skipTests --no-transfer-progress
      - name: Run tests
@@ -21,7 +21,7 @@ jobs:
          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
          restore-keys: ${{ runner.os }}-m2
      - name: Download drivers
-        run: scripts/download_driver.sh
+        run: scripts/download_driver_for_all_platforms.sh
      - name: Intall Playwright
        run: mvn install -D skipTests --no-transfer-progress
      - name: Test CLI
@@ -29,6 +29,3 @@ jobs:
      - 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
@@ -1,4 +1,4 @@
-name: Docker
+name: Test Docker
 on:
  push:
    paths:
@@ -11,25 +11,20 @@ on:
    paths:
      - .github/workflows/test_docker.yml
      - '**/Dockerfile*'
-      - scripts/DRIVER_VERSION
+      - scripts/CLI_VERSION
      - '**/pom.xml'
    branches:
      - main
      - release-*
 jobs:
  test:
-    name: Test
-    timeout-minutes: 120
-    runs-on: ubuntu-22.04
-    strategy:
-      fail-fast: false
-      matrix:
-        flavor: [focal, jammy]
+    timeout-minutes: 60
+    runs-on: ubuntu-20.04
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
      - name: Build Docker image
-        run: bash utils/docker/build.sh --amd64 ${{ matrix.flavor }} playwright-java:localbuild-${{ matrix.flavor }}
+        run: bash utils/docker/build.sh --amd64 focal playwright-java:localbuild-focal
      - name: Test
        run: |
-          CONTAINER_ID="$(docker run --rm --ipc=host -v $(pwd):/root/playwright --name playwright-docker-test -d -t playwright-java:localbuild-${{ matrix.flavor }} /bin/bash)"
+          CONTAINER_ID="$(docker run --rm --ipc=host -v $(pwd):/root/playwright --name playwright-docker-test -d -t playwright-java:localbuild-focal /bin/bash)"
          docker exec "${CONTAINER_ID}" /root/playwright/tools/test-local-installation/create_project_and_run_tests.sh
@@ -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 }}
@@ -22,7 +22,7 @@ jobs:
      - uses: actions/checkout@v2
      - uses: microsoft/playwright-github-action@v1
      - name: Download drivers
-        run: scripts/download_driver.sh
+        run: scripts/download_driver_for_all_platforms.sh
      - name: Regenerate APIs
        run: scripts/generate_api.sh
      - name: Update browser versions in README
@@ -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
@@ -20,38 +20,46 @@ git clone https://github.com/microsoft/playwright-java
 cd playwright-java
 ```

-2. Run the following script to download Playwright driver for all platforms into `driver-bundle/src/main/resources/driver/` directory (browser binaries for Chromium, Firefox and WebKit will be automatically downloaded later on first Playwright run).
+2. Run the following script to download playwright-cli binaries for all platforms into `driver-bundle/src/main/resources/driver/` directory (browser binaries for Chromium, Firefox and WebKit will be automatically downloaded later on first Playwright run).

 ```bash
-scripts/download_driver.sh
+scripts/download_driver_for_all_platforms.sh
 ```

+Names of published driver archives can be found at https://github.com/microsoft/playwright-cli/actions
+
 ### Building and running the tests with Maven

 ```bash
 mvn compile
 mvn test
 # Executing a single test
-BROWSER=chromium mvn test --projects=playwright -Dtest=TestPageNetworkSizes#shouldHaveTheCorrectResponseBodySize
+BROWSER=chromium mvn test -Dtest=TestPageNetworkSizes#shouldHaveTheCorrectResponseBodySize
 # Executing a single test class
-BROWSER=chromium mvn test --projects=playwright -Dtest=TestPageNetworkSizes
+BROWSER=chromium mvn test -Dtest=TestPageNetworkSizes
 ```

 ### Generating API

-Public Java API is generated from api.json which is produced by `print-api-json` command of playwright CLI. To regenerate Java interfaces for the current driver run the following commands:
+Public Java API is generated from api.json which is produced by `playwright-cli print-api-json`. To regenerate
+Java interfaces for the current driver run the following commands:

 ```bash
-./scripts/download_driver.sh
+./scripts/download_driver_for_all_platforms.sh
 ./scripts/generate_api.sh
 ```

 #### Updating driver version

-Versions of published driver archives can be found in [publish canary](https://github.com/microsoft/playwright/actions/workflows/publish_canary.yml) and [publish release](https://github.com/microsoft/playwright/actions/workflows/publish_release_driver.yml) actions logs. To update the driver to a particular version run the following command:
+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
-scripts/roll_driver.sh [version]
+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
@@ -11,11 +11,11 @@ Playwright is a Java library to automate [Chromium](https://www.chromium.org/Hom

 |          | Linux | macOS | Windows |
 |   :---   | :---: | :---: | :---:   |
-| Chromium <!-- GEN:chromium-version -->127.0.6533.17<!-- GEN:stop --> | :white_check_mark: | :white_check_mark: | :white_check_mark: |
-| WebKit <!-- GEN:webkit-version -->17.4<!-- GEN:stop --> | ✅ | ✅ | ✅ |
-| Firefox <!-- GEN:firefox-version -->127.0<!-- GEN:stop --> | :white_check_mark: | :white_check_mark: | :white_check_mark: |
+| Chromium <!-- GEN:chromium-version -->101.0.4951.15<!-- GEN:stop --> | :white_check_mark: | :white_check_mark: | :white_check_mark: |
+| WebKit <!-- GEN:webkit-version -->15.4<!-- GEN:stop --> | ✅ | ✅ | ✅ |
+| Firefox <!-- GEN:firefox-version -->98.0.2<!-- 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/intro#system-requirements) for details.
+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.

 * [Usage](#usage)
  - [Add Maven dependency](#add-maven-dependency)
@@ -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.41.0</version>
+  <version>1.17.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.41.0'
-}
-```
-
 #### Is Playwright thread-safe?

 No, Playwright is not thread safe, i.e. all its methods as well as methods on all objects created by it (such as BrowserContext, Browser, Page etc.) are expected to be called on the same thread where Playwright object was created or proper synchronization should be implemented to ensure only one thread calls Playwright methods at any given time. Having said that it's okay to create multiple Playwright instances each on its own thread.
@@ -65,7 +57,7 @@ You can find Maven project with the examples [here](./examples).

 #### Page screenshot

-This code snippet navigates to Playwright homepage in Chromium, Firefox and WebKit, and saves 3 screenshots.
+This code snippet navigates to whatsmyuseragent.org in Chromium, Firefox and WebKit, and saves 3 screenshots.

 ```java
 import com.microsoft.playwright.*;
@@ -86,7 +78,7 @@ public class PageScreenshot {
        try (Browser browser = browserType.launch()) {
          BrowserContext context = browser.newContext();
          Page page = context.newPage();
-          page.navigate("https://playwright.dev/");
+          page.navigate("http://whatsmyuseragent.org/");
          page.screenshot(new Page.ScreenshotOptions().setPath(Paths.get("screenshot-" + browserType.name() + ".png")));
        }
      }
@@ -122,7 +114,7 @@ public class MobileAndGeolocation {
        .setPermissions(asList("geolocation")));
      Page page = context.newPage();
      page.navigate("https://www.openstreetmap.org/");
-      page.click("a[data-bs-original-title=\"Show My Location\"]");
+      page.click("a[data-original-title=\"Show My Location\"]");
      page.screenshot(new Page.ScreenshotOptions().setPath(Paths.get("colosseum-pixel2.png")));
    }
  }
@@ -181,7 +173,7 @@ public class InterceptNetworkRequests {

 ## Documentation

-Check out our official [documentation site](https://playwright.dev/java).
+Check out our [new documentation site](https://playwright.dev/java)!.

 You can also browse [javadoc online](https://www.javadoc.io/doc/com.microsoft.playwright/playwright/latest/index.html).

@@ -2,19 +2,12 @@

 * 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/DRIVER_VERSION`
-* regenerate API: `./scripts/download_driver.sh -f && ./scripts/generate_api.sh && ./scripts/update_readme.sh`
+* 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

-### Finding driver version
-
-For development versions of Playwright, you can find the latest version by looking at [publish_canary](https://github.com/microsoft/playwright/actions/workflows/publish_canary.yml) workflow -> `publish canary NPM & Publish canary Docker` -> `build & publish driver` step -> `PACKAGE_VERSION`
-<img width="960" alt="image" src="https://github.com/microsoft/playwright-java/assets/9798949/4f33a7f1-b39a-4179-8ae7-fb1d84094c75">
-
-
 # Updating Version

 ```bash
 ./scripts/set_maven_version.sh 1.15.0
 ```
-
@@ -6,7 +6,7 @@
  <parent>
    <groupId>com.microsoft.playwright</groupId>
    <artifactId>parent-pom</artifactId>
-    <version>1.45.1</version>
+    <version>1.21.0</version>
  </parent>

  <artifactId>driver-bundle</artifactId>
@@ -16,6 +16,25 @@
    It is intended to be used on the systems where Playwright driver is not preinstalled.
  </description>

+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+        <configuration>
+          <excludeResources>true</excludeResources>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
  <dependencies>
    <dependency>
      <groupId>com.microsoft.playwright</groupId>
@@ -14,9 +14,7 @@
 * limitations under the License.
 */

-package com.microsoft.playwright.impl.driver.jar;
-
-import com.microsoft.playwright.impl.driver.Driver;
+package com.microsoft.playwright.impl;

 import java.io.IOException;
 import java.net.URI;
@@ -28,9 +26,7 @@ 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";
  private final Path driverTempDir;
-  private Path preinstalledNodePath;

  public DriverJar() throws IOException {
    // Allow specifying custom path for the driver installation
@@ -41,29 +37,13 @@ public class DriverJar extends Driver {
      ? Files.createTempDirectory(prefix)
      : Files.createTempDirectory(Paths.get(alternativeTmpdir), prefix);
    driverTempDir.toFile().deleteOnExit();
-    String nodePath = System.getProperty("playwright.nodejs.path");
-    if (nodePath != null) {
-      preinstalledNodePath = Paths.get(nodePath);
-      if (!Files.exists(preinstalledNodePath)) {
-        throw new RuntimeException("Invalid Node.js path specified: " + nodePath);
-      }
-    }
    logMessage("created DriverJar: " + driverTempDir);
  }

  @Override
-  protected void initialize(Boolean installBrowsers) throws Exception {
-    if (preinstalledNodePath == null && env.containsKey(PLAYWRIGHT_NODEJS_PATH)) {
-      preinstalledNodePath = Paths.get(env.get(PLAYWRIGHT_NODEJS_PATH));
-      if (!Files.exists(preinstalledNodePath)) {
-        throw new RuntimeException("Invalid Node.js path specified: " + preinstalledNodePath);
-      }
-    } else if (preinstalledNodePath != null) {
-      // Pass the env variable to the driver process.
-      env.put(PLAYWRIGHT_NODEJS_PATH, preinstalledNodePath.toString());
-    }
+  protected void initialize(Map<String, String> env, Boolean installBrowsers) throws Exception {
    extractDriverToTempDir();
-    logMessage("extracted driver from jar to " + driverDir());
+    logMessage("extracted driver from jar to " + driverPath());
    if (installBrowsers)
      installBrowsers(env);
  }
@@ -77,16 +57,13 @@ public class DriverJar extends Driver {
      System.out.println("Skipping browsers download because `PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD` env variable is set");
      return;
    }
-    if (env.get(SELENIUM_REMOTE_URL) != null || System.getenv(SELENIUM_REMOTE_URL) != null) {
-      logMessage("Skipping browsers download because `SELENIUM_REMOTE_URL` env variable is set");
-      return;
-    }
-    Path driver = driverDir();
+    Path driver = driverPath();
    if (!Files.exists(driver)) {
      throw new RuntimeException("Failed to find driver: " + driver);
    }
-    ProcessBuilder pb = createProcessBuilder();
-    pb.command().add("install");
+    ProcessBuilder pb = new ProcessBuilder(driver.toString(), "install");
+    pb.environment().putAll(env);
+    setRequiredEnvironmentVariables(pb);
    pb.redirectError(ProcessBuilder.Redirect.INHERIT);
    pb.redirectOutput(ProcessBuilder.Redirect.INHERIT);
    Process p = pb.start();
@@ -105,25 +82,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
@@ -131,12 +96,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 {
@@ -180,30 +139,20 @@ public class DriverJar extends Driver {

  private static String platformDir() {
    String name = System.getProperty("os.name").toLowerCase();
-    String arch = System.getProperty("os.arch").toLowerCase();
-
    if (name.contains("windows")) {
      return "win32_x64";
    }
    if (name.contains("linux")) {
-      if (arch.equals("aarch64")) {
-        return "linux-arm64";
-      } else {
-        return "linux";
-      }
+      return "linux";
    }
    if (name.contains("mac os x")) {
-      if (arch.equals("aarch64")) {
-        return "mac-arm64";
-      } else {
-        return "mac";
-      }
+      return "mac";
    }
    throw new RuntimeException("Unexpected os.name value: " + name);
  }

  @Override
-  public Path driverDir() {
+  Path driverDir() {
    return driverTempDir;
  }
 }
@@ -0,0 +1,90 @@
+/*
+ * 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.DriverJar;
+import org.junit.jupiter.api.*;
+import org.junit.jupiter.api.io.TempDir;
+
+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 org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class TestInstall {
+  @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");
+    // Clear system property to ensure that the default driver is loaded.
+    System.clearProperty("playwright.driver.impl");
+  }
+
+  @Test
+  @Tags({@Tag("isolated"), @Tag("driverThrowTest")})
+  void shouldThrowWhenBrowserPathIsInvalid() {
+    Map<String,String> env = new HashMap<>();
+    env.put("PLAYWRIGHT_BROWSERS_PATH", "/some/bad/path/that/should/not/exist/i/hope");
+
+    assertThrows(RuntimeException.class, () -> Driver.ensureDriverInstalled(env, true));
+    assertThrows(RuntimeException.class, () -> Driver.ensureDriverInstalled(env, true));
+  }
+
+  @Test
+  void playwrightCliInstalled() throws Exception {
+    Path cli = Driver.ensureDriverInstalled(Collections.emptyMap(), false);
+    assertTrue(Files.exists(cli));
+
+    ProcessBuilder pb = new ProcessBuilder(cli.toString(), "install");
+    pb.redirectError(ProcessBuilder.Redirect.INHERIT);
+    pb.redirectOutput(ProcessBuilder.Redirect.INHERIT);
+    Process p = pb.start();
+    boolean result = p.waitFor(1, TimeUnit.MINUTES);
+    assertTrue(result, "Timed out waiting for browsers to install");
+  }
+
+  @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.ensureDriverInstalled(Collections.emptyMap(), false));
+  }
+
+  @Test
+  void playwrightDriverAlternativeImpl() {
+    System.setProperty("playwright.driver.impl", "com.microsoft.playwright.impl.AlternativeDriver");
+    RuntimeException thrown =
+      assertThrows(
+        RuntimeException.class,
+        () -> Driver.ensureDriverInstalled(Collections.emptyMap(), false));
+    assertEquals("Failed to create driver", thrown.getMessage());
+  }
+}
@@ -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.Driver.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.driverDir()));
-
-    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.driverDir().startsWith(tmpdir), "Driver path: " + driver.driverDir() + " 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.driverDir().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.driverDir().resolve("node");
-    assertFalse(Files.exists(builtinNode), builtinNode.toString());
-    Path builtinNodeExe = driver.driverDir().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,7 +6,7 @@
  <parent>
    <groupId>com.microsoft.playwright</groupId>
    <artifactId>parent-pom</artifactId>
-    <version>1.45.1</version>
+    <version>1.21.0</version>
  </parent>

  <artifactId>driver</artifactId>
@@ -15,6 +15,22 @@
    This module provides API for discovery and launching of Playwright driver.
  </description>

+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
  <dependencies>
    <dependency>
      <groupId>org.junit.jupiter</groupId>
@@ -14,14 +14,14 @@
 * limitations under the License.
 */

-package com.microsoft.playwright.impl.driver;
+package com.microsoft.playwright.impl;

 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.LinkedHashMap;
+import java.time.ZonedDateTime;
 import java.util.Map;

-import static com.microsoft.playwright.impl.driver.DriverLogging.logWithTimestamp;
+import static com.microsoft.playwright.impl.DriverLogging.logWithTimestamp;

 /**
 * This class provides access to playwright-cli. It can be either preinstalled
@@ -29,9 +29,6 @@ import static com.microsoft.playwright.impl.driver.DriverLogging.logWithTimestam
 * 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<>(System.getenv());
-  public static final String PLAYWRIGHT_NODEJS_PATH = "PLAYWRIGHT_NODEJS_PATH";
-
  private static Driver instance;

  private static class PreinstalledDriver extends Driver {
@@ -42,45 +39,46 @@ public abstract class Driver {
    }

    @Override
-    protected void initialize(Boolean installBrowsers) {
+    protected void initialize(Map<String, String> env, Boolean installBrowsers) {
      // no-op
    }

    @Override
-    public Path driverDir() {
+    Path driverDir() {
      return driverDir;
    }
  }

-  public static synchronized Driver ensureDriverInstalled(Map<String, String> env, Boolean installBrowsers) {
+  public static synchronized Path ensureDriverInstalled(Map<String, String> env, Boolean installBrowsers) {
    if (instance == null) {
-      instance = createAndInstall(env, installBrowsers);
+      try {
+        instance = createDriver();
+        logMessage("initializing driver");
+        instance.initialize(env, installBrowsers);
+        logMessage("driver initialized.");
+      } catch (Exception exception) {
+        instance = null;
+        throw new RuntimeException("Failed to create driver", exception);
+      }
    }
-    return instance;
+    return instance.driverPath();
  }

-  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;
+  protected abstract void initialize(Map<String, String> env, Boolean installBrowsers) throws Exception;

-  public ProcessBuilder createProcessBuilder() {
-    String nodePath = env.get("PLAYWRIGHT_NODEJS_PATH");
-    if (nodePath == null) {
-      String node = System.getProperty("os.name").toLowerCase().contains("windows") ? "node.exe" : "node";
-      nodePath = driverDir().resolve(node).toAbsolutePath().toString();
-    }
-    ProcessBuilder pb = new ProcessBuilder(nodePath);
-    pb.command().add(driverDir().resolve("package").resolve("cli.js").toAbsolutePath().toString());
-    pb.environment().putAll(env);
+  public Path driverPath() {
+    String cliFileName = System.getProperty("os.name").toLowerCase().contains("windows") ?
+      "playwright.cmd" : "playwright.sh";
+    return driverDir().resolve(cliFileName);
+  }
+
+  public static void setRequiredEnvironmentVariables(ProcessBuilder pb) {
    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() {
@@ -94,31 +92,20 @@ public abstract class Driver {
    }
    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 {
+  private static Driver createDriver() 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");
+      System.getProperty("playwright.driver.impl", "com.microsoft.playwright.impl.DriverJar");
    Class<?> jarDriver = Class.forName(driverImpl);
    return (Driver) jarDriver.getDeclaredConstructor().newInstance();
  }

-  public abstract Path driverDir();
+  abstract Path driverDir();

  protected static void logMessage(String message) {
    // This matches log format produced by the server.
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-package com.microsoft.playwright.impl.driver;
+package com.microsoft.playwright.impl;

 import java.time.ZoneId;
 import java.time.ZonedDateTime;
@@ -6,7 +6,7 @@

  <groupId>org.example</groupId>
  <artifactId>examples</artifactId>
-  <version>1.45.1</version>
+  <version>1.21.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.41.0</version>
+      <version>1.17.0</version>
    </dependency>
  </dependencies>
  <build>
@@ -23,7 +23,7 @@
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.12.1</version>
+        <version>3.1</version>
        <configuration>
          <source>1.8</source>
          <target>1.8</target>
@@ -34,7 +34,7 @@ public class PageScreenshot {
        try (Browser browser = browserType.launch()) {
          BrowserContext context = browser.newContext();
          Page page = context.newPage();
-          page.navigate("https://playwright.dev/");
+          page.navigate("http://whatsmyuseragent.org/");
          page.screenshot(new Page.ScreenshotOptions().setPath(Paths.get("screenshot-" + browserType.name() + ".png")));
        }
      }
@@ -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")));
-    }
-  }
-}
@@ -24,7 +24,7 @@ public class WebKitScreenshot {
    try (Playwright playwright = Playwright.create()) {
      Browser browser = playwright.webkit().launch();
      Page page = browser.newPage();
-      page.navigate("https://playwright.dev/");
+      page.navigate("http://whatsmyuseragent.org/");
      page.screenshot(new Page.ScreenshotOptions().setPath(Paths.get("example.png")));
    }
  }
@@ -7,7 +7,7 @@
  <parent>
    <groupId>com.microsoft.playwright</groupId>
    <artifactId>parent-pom</artifactId>
-    <version>1.45.1</version>
+    <version>1.21.0</version>
  </parent>

  <artifactId>playwright</artifactId>
@@ -21,14 +21,26 @@

  <build>
    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+      </plugin>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-javadoc-plugin</artifactId>
-        <configuration combine.self="append">
+        <configuration>
          <subpackages>com.microsoft.playwright</subpackages>
          <excludePackageNames>com.microsoft.playwright.impl</excludePackageNames>
        </configuration>
      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+      </plugin>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-jar-plugin</artifactId>
@@ -21,33 +21,31 @@ 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
- * com.microsoft.playwright.Playwright#request Playwright.request()}. For more information see {@code APIRequestContext}.
+ * 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 com.microsoft.playwright.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:
+     * 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} and sending request to {@code /bar.html} results in {@code http://localhost:3000/bar.html}</li>
+     * <li> baseURL: {@code http://localhost:3000/foo/} and sending request to {@code ./bar.html} results in
+     * {@code http://localhost:3000/foo/bar.html}</li>
     * <li> baseURL: {@code http://localhost:3000/foo} (without trailing slash) and navigating to {@code ./bar.html} results in
     * {@code http://localhost:3000/bar.html}</li>
     * </ul>
     */
    public String baseURL;
    /**
-     * An object containing additional HTTP headers to be sent with every request. Defaults to none.
+     * 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>. If
-     * no origin is specified, the username and password are sent to any servers upon unauthorized responses.
+     * Credentials for <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication">HTTP authentication</a>.
     */
    public HttpCredentials httpCredentials;
    /**
@@ -60,22 +58,20 @@ public interface APIRequest {
    public Proxy proxy;
    /**
     * Populates context with given storage state. This option can be used to initialize context with logged-in information
-     * obtained via {@link com.microsoft.playwright.BrowserContext#storageState BrowserContext.storageState()} or {@link
-     * com.microsoft.playwright.APIRequestContext#storageState APIRequestContext.storageState()}. Either a path to the file
-     * with saved storage, or the value returned by one of {@link com.microsoft.playwright.BrowserContext#storageState
-     * BrowserContext.storageState()} or {@link com.microsoft.playwright.APIRequestContext#storageState
+     * 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 com.microsoft.playwright.BrowserContext#storageState BrowserContext.storageState()}. Path to the
-     * file with saved storage state.
+     * 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.
+     * Maximum time in milliseconds to wait for the response. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout.
     */
    public Double timeout;
    /**
@@ -84,14 +80,13 @@ public interface APIRequest {
    public String userAgent;

    /**
-     * Methods like {@link com.microsoft.playwright.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:
+     * 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} 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>
@@ -101,22 +96,20 @@ public interface APIRequest {
      return this;
    }
    /**
-     * An object containing additional HTTP headers to be sent with every request. Defaults to none.
+     * An object containing additional HTTP headers to be sent with every request.
     */
    public NewContextOptions setExtraHTTPHeaders(Map<String, String> extraHTTPHeaders) {
      this.extraHTTPHeaders = extraHTTPHeaders;
      return this;
    }
    /**
-     * Credentials for <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication">HTTP authentication</a>. If
-     * no origin is specified, the username and password are sent to any servers upon unauthorized responses.
+     * 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>. If
-     * no origin is specified, the username and password are sent to any servers upon unauthorized responses.
+     * Credentials for <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication">HTTP authentication</a>.
     */
    public NewContextOptions setHttpCredentials(HttpCredentials httpCredentials) {
      this.httpCredentials = httpCredentials;
@@ -144,10 +137,9 @@ public interface APIRequest {
    }
    /**
     * Populates context with given storage state. This option can be used to initialize context with logged-in information
-     * obtained via {@link com.microsoft.playwright.BrowserContext#storageState BrowserContext.storageState()} or {@link
-     * com.microsoft.playwright.APIRequestContext#storageState APIRequestContext.storageState()}. Either a path to the file
-     * with saved storage, or the value returned by one of {@link com.microsoft.playwright.BrowserContext#storageState
-     * BrowserContext.storageState()} or {@link com.microsoft.playwright.APIRequestContext#storageState
+     * 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) {
@@ -156,16 +148,15 @@ public interface APIRequest {
    }
    /**
     * Populates context with given storage state. This option can be used to initialize context with logged-in information
-     * obtained via {@link com.microsoft.playwright.BrowserContext#storageState BrowserContext.storageState()}. Path to the
-     * file with saved storage state.
+     * 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.
+     * 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;
@@ -181,16 +172,12 @@ public interface APIRequest {
  }
  /**
   * 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);
 }
@@ -23,40 +23,24 @@ 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 com.microsoft.playwright.BrowserContext#request
- * BrowserContext.request()} or {@link com.microsoft.playwright.Page#request Page.request()}. It is also possible to create
- * a new APIRequestContext instance manually by calling {@link com.microsoft.playwright.APIRequest#newContext
- * APIRequest.newContext()}.
+ * <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> <strong>Cookie management</strong>
+ * <p> **Cookie management**
 *
- * <p> {@code APIRequestContext} returned by {@link com.microsoft.playwright.BrowserContext#request BrowserContext.request()}
- * and {@link com.microsoft.playwright.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> {@code APIRequestContext} retuned 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 com.microsoft.playwright.APIRequest#newContext APIRequest.newContext()}. Such {@code APIRequestContext}
- * object will have its own isolated cookie storage.
+ * <p> If you want API requests to not interfere with the browser cookies you shoud 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 DisposeOptions {
-    /**
-     * The reason to be reported to the operations interrupted by the context disposal.
-     */
-    public String reason;
-
-    /**
-     * The reason to be reported to the operations interrupted by the context disposal.
-     */
-    public DisposeOptions setReason(String reason) {
-      this.reason = reason;
-      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
@@ -79,7 +63,6 @@ public interface APIRequestContext {
   * The method will automatically follow redirects.
   *
   * @param url Target URL.
-   * @since v1.16
   */
  default APIResponse delete(String url) {
    return delete(url, null);
@@ -91,63 +74,19 @@ public interface APIRequestContext {
   *
   * @param url Target URL.
   * @param params Optional request parameters.
-   * @since v1.16
   */
  APIResponse delete(String url, RequestOptions params);
  /**
-   * All responses returned by {@link com.microsoft.playwright.APIRequestContext#get APIRequestContext.get()} and similar
-   * methods are stored in the memory, so that you can later call {@link com.microsoft.playwright.APIResponse#body
-   * APIResponse.body()}.This method discards all its resources, calling any method on disposed {@code APIRequestContext}
-   * will throw an exception.
-   *
-   * @since v1.16
+   * 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.
   */
-  default void dispose() {
-    dispose(null);
-  }
-  /**
-   * All responses returned by {@link com.microsoft.playwright.APIRequestContext#get APIRequestContext.get()} and similar
-   * methods are stored in the memory, so that you can later call {@link com.microsoft.playwright.APIResponse#body
-   * APIResponse.body()}.This method discards all its resources, calling any method on disposed {@code APIRequestContext}
-   * will throw an exception.
-   *
-   * @since v1.16
-   */
-  void dispose(DisposeOptions options);
+  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.
   *
-   * <p> <strong>Usage</strong>
-   *
-   * <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.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 upload them as form fields with {@code
-   * multipart/form-data} encoding. Use {@code FormData} to construct request body and pass it to the request as {@code
-   * multipart} parameter:
-   * <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/uploadScript",
-   *   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);
@@ -156,73 +95,15 @@ public interface APIRequestContext {
   * 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.
   *
-   * <p> <strong>Usage</strong>
-   *
-   * <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.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 upload them as form fields with {@code
-   * multipart/form-data} encoding. Use {@code FormData} to construct request body and pass it to the request as {@code
-   * multipart} parameter:
-   * <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/uploadScript",
-   *   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.
   *
-   * <p> <strong>Usage</strong>
-   *
-   * <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.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 upload them as form fields with {@code
-   * multipart/form-data} encoding. Use {@code FormData} to construct request body and pass it to the request as {@code
-   * multipart} parameter:
-   * <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/uploadScript",
-   *   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);
@@ -231,37 +112,8 @@ public interface APIRequestContext {
   * 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.
   *
-   * <p> <strong>Usage</strong>
-   *
-   * <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.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 upload them as form fields with {@code
-   * multipart/form-data} encoding. Use {@code FormData} to construct request body and pass it to the request as {@code
-   * multipart} parameter:
-   * <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/uploadScript",
-   *   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);
  /**
@@ -269,17 +121,7 @@ public interface APIRequestContext {
   * response. The method will populate request cookies from the context and update context cookies from the response. The
   * method will automatically follow redirects.
   *
-   * <p> <strong>Usage</strong>
-   *
-   * <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);
@@ -289,18 +131,8 @@ public interface APIRequestContext {
   * response. The method will populate request cookies from the context and update context cookies from the response. The
   * method will automatically follow redirects.
   *
-   * <p> <strong>Usage</strong>
-   *
-   * <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);
  /**
@@ -309,7 +141,6 @@ public interface APIRequestContext {
   * method will automatically follow redirects.
   *
   * @param url Target URL.
-   * @since v1.16
   */
  default APIResponse head(String url) {
    return head(url, null);
@@ -321,7 +152,6 @@ public interface APIRequestContext {
   *
   * @param url Target URL.
   * @param params Optional request parameters.
-   * @since v1.16
   */
  APIResponse head(String url, RequestOptions params);
  /**
@@ -330,7 +160,6 @@ public interface APIRequestContext {
   * The method will automatically follow redirects.
   *
   * @param url Target URL.
-   * @since v1.16
   */
  default APIResponse patch(String url) {
    return patch(url, null);
@@ -342,7 +171,6 @@ public interface APIRequestContext {
   *
   * @param url Target URL.
   * @param params Optional request parameters.
-   * @since v1.16
   */
  APIResponse patch(String url, RequestOptions params);
  /**
@@ -350,45 +178,7 @@ public interface APIRequestContext {
   * response. The method will populate request cookies from the context and update context cookies from the response. The
   * method will automatically follow redirects.
   *
-   * <p> <strong>Usage</strong>
-   *
-   * <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. Use {@code FormData} to construct request body and pass it to the request as {@code
-   * multipart} parameter:
-   * <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 filePayload1 = new FilePayload("f1.js", "text/javascript",
-   *       "console.log(2022);".getBytes(StandardCharsets.UTF_8));
-   * APIResponse response = request.post("https://example.com/api/uploadScript",
-   *   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);
@@ -398,46 +188,8 @@ public interface APIRequestContext {
   * response. The method will populate request cookies from the context and update context cookies from the response. The
   * method will automatically follow redirects.
   *
-   * <p> <strong>Usage</strong>
-   *
-   * <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. Use {@code FormData} to construct request body and pass it to the request as {@code
-   * multipart} parameter:
-   * <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 filePayload1 = new FilePayload("f1.js", "text/javascript",
-   *       "console.log(2022);".getBytes(StandardCharsets.UTF_8));
-   * APIResponse response = request.post("https://example.com/api/uploadScript",
-   *   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);
  /**
@@ -446,7 +198,6 @@ public interface APIRequestContext {
   * method will automatically follow redirects.
   *
   * @param url Target URL.
-   * @since v1.16
   */
  default APIResponse put(String url) {
    return put(url, null);
@@ -458,14 +209,11 @@ public interface APIRequestContext {
   *
   * @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);
@@ -473,8 +221,6 @@ public interface APIRequestContext {
  /**
   * 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);
 }
@@ -20,63 +20,45 @@ import com.microsoft.playwright.options.*;
 import java.util.*;

 /**
- * {@code APIResponse} class represents responses returned by {@link com.microsoft.playwright.APIRequestContext#get
- * APIRequestContext.get()} and similar methods.
+ * {@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();
 }
@@ -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;
-
-import java.util.function.Consumer;
-import com.google.gson.JsonObject;
-
-/**
- * The {@code CDPSession} instances are used to talk raw Chrome Devtools Protocol:
- * <ul>
- * <li> protocol methods can be called with {@code session.send} method.</li>
- * <li> protocol events can be subscribed to with {@code session.on} method.</li>
- * </ul>
- *
- * <p> Useful links:
- * <ul>
- * <li> Documentation on DevTools Protocol can be found here: <a
- * href="https://chromedevtools.github.io/devtools-protocol/">DevTools Protocol Viewer</a>.</li>
- * <li> Getting Started with DevTools Protocol: https://github.com/aslushnikov/getting-started-with-cdp/blob/master/README.md</li>
- * </ul>
- * <pre>{@code
- * CDPSession client = page.context().newCDPSession(page);
- * client.send("Runtime.enable");
- *
- * client.on("Animation.animationCreated", (event) -> System.out.println("Animation created!"));
- *
- * JsonObject response = client.send("Animation.getPlaybackRate");
- * double playbackRate = response.get("playbackRate").getAsDouble();
- * System.out.println("playback rate is " + playbackRate);
- *
- * JsonObject params = new JsonObject();
- * params.addProperty("playbackRate", playbackRate / 2);
- * client.send("Animation.setPlaybackRate", params);
- * }</pre>
- */
-public interface CDPSession {
-  /**
-   * Detaches the CDPSession from the target. Once detached, the CDPSession object won't emit any events and can't be used to
-   * send messages.
-   *
-   * @since v1.8
-   */
-  void detach();
-  /**
-   *
-   *
-   * @param method Protocol method name.
-   * @since v1.8
-   */
-  default JsonObject send(String method) {
-    return send(method, null);
-  }
-  /**
-   *
-   *
-   * @param method Protocol method name.
-   * @param args Optional method parameters.
-   * @since v1.8
-   */
-  JsonObject send(String method, JsonObject args);
-  /**
-   * Register an event handler for events with the specified event name. The given handler will be called for every event
-   * with the given name.
-   *
-   * @param eventName CDP event name.
-   * @param handler Event handler.
-   * @since v1.37
-   */
-  void on(String eventName, Consumer<JsonObject> handler);
-  /**
-   * Unregister an event handler for events with the specified event name. The given handler will not be called anymore for
-   * events with the given name.
-   *
-   * @param eventName CDP event name.
-   * @param handler Event handler.
-   * @since v1.37
-   */
-  void off(String eventName, Consumer<JsonObject> handler);
-}
-
@@ -16,7 +16,7 @@

 package com.microsoft.playwright;

-import com.microsoft.playwright.impl.driver.Driver;
+import com.microsoft.playwright.impl.Driver;

 import java.io.IOException;
 import java.nio.file.Path;
@@ -29,9 +29,10 @@ import static java.util.Arrays.asList;
 */
 public class CLI {
  public static void main(String[] args) throws IOException, InterruptedException {
-    Driver driver = Driver.ensureDriverInstalled(Collections.emptyMap(), false);
-    ProcessBuilder pb = driver.createProcessBuilder();
+    Path driver = Driver.ensureDriverInstalled(Collections.emptyMap(), false);
+    ProcessBuilder pb = new ProcessBuilder(driver.toString());
    pb.command().addAll(asList(args));
+    Driver.setRequiredEnvironmentVariables(pb);
    String version = Playwright.class.getPackage().getImplementationVersion();
    if (version != null) {
      pb.environment().put("PW_CLI_DISPLAY_VERSION", version);
@@ -1,312 +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.util.Date;
-
-/**
- * Accurately simulating time-dependent behavior is essential for verifying the correctness of applications. Learn more
- * about <a href="https://playwright.dev/java/docs/clock">clock emulation</a>.
- *
- * <p> Note that clock is installed for the entire {@code BrowserContext}, so the time in all the pages and iframes is
- * controlled by the same clock.
- */
-public interface Clock {
-  class InstallOptions {
-    /**
-     * Time to initialize with, current system time by default.
-     */
-    public Object time;
-
-    /**
-     * Time to initialize with, current system time by default.
-     */
-    public InstallOptions setTime(long time) {
-      this.time = time;
-      return this;
-    }
-    /**
-     * Time to initialize with, current system time by default.
-     */
-    public InstallOptions setTime(String time) {
-      this.time = time;
-      return this;
-    }
-    /**
-     * Time to initialize with, current system time by default.
-     */
-    public InstallOptions setTime(Date time) {
-      this.time = time;
-      return this;
-    }
-  }
-  /**
-   * Advance the clock by jumping forward in time. Only fires due timers at most once. This is equivalent to user closing the
-   * laptop lid for a while and reopening it later, after given time.
-   *
-   * <p> <strong>Usage</strong>
-   * <pre>{@code
-   * page.clock().fastForward(1000);
-   * page.clock().fastForward("30:00");
-   * }</pre>
-   *
-   * @param ticks Time may be the number of milliseconds to advance the clock by or a human-readable string. Valid string formats are "08"
-   * for eight seconds, "01:00" for one minute and "02:34:10" for two hours, 34 minutes and ten seconds.
-   * @since v1.45
-   */
-  void fastForward(long ticks);
-  /**
-   * Advance the clock by jumping forward in time. Only fires due timers at most once. This is equivalent to user closing the
-   * laptop lid for a while and reopening it later, after given time.
-   *
-   * <p> <strong>Usage</strong>
-   * <pre>{@code
-   * page.clock().fastForward(1000);
-   * page.clock().fastForward("30:00");
-   * }</pre>
-   *
-   * @param ticks Time may be the number of milliseconds to advance the clock by or a human-readable string. Valid string formats are "08"
-   * for eight seconds, "01:00" for one minute and "02:34:10" for two hours, 34 minutes and ten seconds.
-   * @since v1.45
-   */
-  void fastForward(String ticks);
-  /**
-   * Install fake implementations for the following time-related functions:
-   * <ul>
-   * <li> {@code Date}</li>
-   * <li> {@code setTimeout}</li>
-   * <li> {@code clearTimeout}</li>
-   * <li> {@code setInterval}</li>
-   * <li> {@code clearInterval}</li>
-   * <li> {@code requestAnimationFrame}</li>
-   * <li> {@code cancelAnimationFrame}</li>
-   * <li> {@code requestIdleCallback}</li>
-   * <li> {@code cancelIdleCallback}</li>
-   * <li> {@code performance}</li>
-   * </ul>
-   *
-   * <p> Fake timers are used to manually control the flow of time in tests. They allow you to advance time, fire timers, and
-   * control the behavior of time-dependent functions. See {@link com.microsoft.playwright.Clock#runFor Clock.runFor()} and
-   * {@link com.microsoft.playwright.Clock#fastForward Clock.fastForward()} for more information.
-   *
-   * @since v1.45
-   */
-  default void install() {
-    install(null);
-  }
-  /**
-   * Install fake implementations for the following time-related functions:
-   * <ul>
-   * <li> {@code Date}</li>
-   * <li> {@code setTimeout}</li>
-   * <li> {@code clearTimeout}</li>
-   * <li> {@code setInterval}</li>
-   * <li> {@code clearInterval}</li>
-   * <li> {@code requestAnimationFrame}</li>
-   * <li> {@code cancelAnimationFrame}</li>
-   * <li> {@code requestIdleCallback}</li>
-   * <li> {@code cancelIdleCallback}</li>
-   * <li> {@code performance}</li>
-   * </ul>
-   *
-   * <p> Fake timers are used to manually control the flow of time in tests. They allow you to advance time, fire timers, and
-   * control the behavior of time-dependent functions. See {@link com.microsoft.playwright.Clock#runFor Clock.runFor()} and
-   * {@link com.microsoft.playwright.Clock#fastForward Clock.fastForward()} for more information.
-   *
-   * @since v1.45
-   */
-  void install(InstallOptions options);
-  /**
-   * Advance the clock, firing all the time-related callbacks.
-   *
-   * <p> <strong>Usage</strong>
-   * <pre>{@code
-   * page.clock().runFor(1000);
-   * page.clock().runFor("30:00");
-   * }</pre>
-   *
-   * @param ticks Time may be the number of milliseconds to advance the clock by or a human-readable string. Valid string formats are "08"
-   * for eight seconds, "01:00" for one minute and "02:34:10" for two hours, 34 minutes and ten seconds.
-   * @since v1.45
-   */
-  void runFor(long ticks);
-  /**
-   * Advance the clock, firing all the time-related callbacks.
-   *
-   * <p> <strong>Usage</strong>
-   * <pre>{@code
-   * page.clock().runFor(1000);
-   * page.clock().runFor("30:00");
-   * }</pre>
-   *
-   * @param ticks Time may be the number of milliseconds to advance the clock by or a human-readable string. Valid string formats are "08"
-   * for eight seconds, "01:00" for one minute and "02:34:10" for two hours, 34 minutes and ten seconds.
-   * @since v1.45
-   */
-  void runFor(String ticks);
-  /**
-   * Advance the clock by jumping forward in time and pause the time. Once this method is called, no timers are fired unless
-   * {@link com.microsoft.playwright.Clock#runFor Clock.runFor()}, {@link com.microsoft.playwright.Clock#fastForward
-   * Clock.fastForward()}, {@link com.microsoft.playwright.Clock#pauseAt Clock.pauseAt()} or {@link
-   * com.microsoft.playwright.Clock#resume Clock.resume()} is called.
-   *
-   * <p> Only fires due timers at most once. This is equivalent to user closing the laptop lid for a while and reopening it at
-   * the specified time and pausing.
-   *
-   * <p> <strong>Usage</strong>
-   * <pre>{@code
-   * SimpleDateFormat format = new SimpleDateFormat("yyy-MM-dd");
-   * page.clock().pauseAt(format.parse("2020-02-02"));
-   * page.clock().pauseAt("2020-02-02");
-   * }</pre>
-   *
-   * @param time Time to pause at.
-   * @since v1.45
-   */
-  void pauseAt(long time);
-  /**
-   * Advance the clock by jumping forward in time and pause the time. Once this method is called, no timers are fired unless
-   * {@link com.microsoft.playwright.Clock#runFor Clock.runFor()}, {@link com.microsoft.playwright.Clock#fastForward
-   * Clock.fastForward()}, {@link com.microsoft.playwright.Clock#pauseAt Clock.pauseAt()} or {@link
-   * com.microsoft.playwright.Clock#resume Clock.resume()} is called.
-   *
-   * <p> Only fires due timers at most once. This is equivalent to user closing the laptop lid for a while and reopening it at
-   * the specified time and pausing.
-   *
-   * <p> <strong>Usage</strong>
-   * <pre>{@code
-   * SimpleDateFormat format = new SimpleDateFormat("yyy-MM-dd");
-   * page.clock().pauseAt(format.parse("2020-02-02"));
-   * page.clock().pauseAt("2020-02-02");
-   * }</pre>
-   *
-   * @param time Time to pause at.
-   * @since v1.45
-   */
-  void pauseAt(String time);
-  /**
-   * Advance the clock by jumping forward in time and pause the time. Once this method is called, no timers are fired unless
-   * {@link com.microsoft.playwright.Clock#runFor Clock.runFor()}, {@link com.microsoft.playwright.Clock#fastForward
-   * Clock.fastForward()}, {@link com.microsoft.playwright.Clock#pauseAt Clock.pauseAt()} or {@link
-   * com.microsoft.playwright.Clock#resume Clock.resume()} is called.
-   *
-   * <p> Only fires due timers at most once. This is equivalent to user closing the laptop lid for a while and reopening it at
-   * the specified time and pausing.
-   *
-   * <p> <strong>Usage</strong>
-   * <pre>{@code
-   * SimpleDateFormat format = new SimpleDateFormat("yyy-MM-dd");
-   * page.clock().pauseAt(format.parse("2020-02-02"));
-   * page.clock().pauseAt("2020-02-02");
-   * }</pre>
-   *
-   * @param time Time to pause at.
-   * @since v1.45
-   */
-  void pauseAt(Date time);
-  /**
-   * Resumes timers. Once this method is called, time resumes flowing, timers are fired as usual.
-   *
-   * @since v1.45
-   */
-  void resume();
-  /**
-   * Makes {@code Date.now} and {@code new Date()} return fixed fake time at all times, keeps all the timers running.
-   *
-   * <p> <strong>Usage</strong>
-   * <pre>{@code
-   * page.clock().setFixedTime(new Date());
-   * page.clock().setFixedTime(new SimpleDateFormat("yyy-MM-dd").parse("2020-02-02"));
-   * page.clock().setFixedTime("2020-02-02");
-   * }</pre>
-   *
-   * @param time Time to be set in milliseconds.
-   * @since v1.45
-   */
-  void setFixedTime(long time);
-  /**
-   * Makes {@code Date.now} and {@code new Date()} return fixed fake time at all times, keeps all the timers running.
-   *
-   * <p> <strong>Usage</strong>
-   * <pre>{@code
-   * page.clock().setFixedTime(new Date());
-   * page.clock().setFixedTime(new SimpleDateFormat("yyy-MM-dd").parse("2020-02-02"));
-   * page.clock().setFixedTime("2020-02-02");
-   * }</pre>
-   *
-   * @param time Time to be set in milliseconds.
-   * @since v1.45
-   */
-  void setFixedTime(String time);
-  /**
-   * Makes {@code Date.now} and {@code new Date()} return fixed fake time at all times, keeps all the timers running.
-   *
-   * <p> <strong>Usage</strong>
-   * <pre>{@code
-   * page.clock().setFixedTime(new Date());
-   * page.clock().setFixedTime(new SimpleDateFormat("yyy-MM-dd").parse("2020-02-02"));
-   * page.clock().setFixedTime("2020-02-02");
-   * }</pre>
-   *
-   * @param time Time to be set in milliseconds.
-   * @since v1.45
-   */
-  void setFixedTime(Date time);
-  /**
-   * Sets current system time but does not trigger any timers.
-   *
-   * <p> <strong>Usage</strong>
-   * <pre>{@code
-   * page.clock().setSystemTime(new Date());
-   * page.clock().setSystemTime(new SimpleDateFormat("yyy-MM-dd").parse("2020-02-02"));
-   * page.clock().setSystemTime("2020-02-02");
-   * }</pre>
-   *
-   * @param time Time to be set in milliseconds.
-   * @since v1.45
-   */
-  void setSystemTime(long time);
-  /**
-   * Sets current system time but does not trigger any timers.
-   *
-   * <p> <strong>Usage</strong>
-   * <pre>{@code
-   * page.clock().setSystemTime(new Date());
-   * page.clock().setSystemTime(new SimpleDateFormat("yyy-MM-dd").parse("2020-02-02"));
-   * page.clock().setSystemTime("2020-02-02");
-   * }</pre>
-   *
-   * @param time Time to be set in milliseconds.
-   * @since v1.45
-   */
-  void setSystemTime(String time);
-  /**
-   * Sets current system time but does not trigger any timers.
-   *
-   * <p> <strong>Usage</strong>
-   * <pre>{@code
-   * page.clock().setSystemTime(new Date());
-   * page.clock().setSystemTime(new SimpleDateFormat("yyy-MM-dd").parse("2020-02-02"));
-   * page.clock().setSystemTime("2020-02-02");
-   * }</pre>
-   *
-   * @param time Time to be set in milliseconds.
-   * @since v1.45
-   */
-  void setSystemTime(Date time);
-}
-
@@ -19,20 +19,19 @@ package com.microsoft.playwright;
 import java.util.*;

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


 /**
- * {@code Dialog} objects are dispatched by page via the {@link com.microsoft.playwright.Page#onDialog Page.onDialog()}
- * event.
+ * {@code Dialog} objects are dispatched by page via the {@link Page#onDialog Page.onDialog()} event.
 *
 * <p> An example of using {@code Dialog} class:
 * <pre>{@code
@@ -42,17 +41,15 @@ package com.microsoft.playwright;
 * }
 * }</pre>
 *
- * <p> <strong>NOTE:</strong> Dialogs are dismissed automatically, unless there is a {@link com.microsoft.playwright.Page#onDialog Page.onDialog()}
- * listener. When listener is present, it **must** either {@link com.microsoft.playwright.Dialog#accept Dialog.accept()} or
- * {@link com.microsoft.playwright.Dialog#dismiss Dialog.dismiss()} the dialog - otherwise the page will <a
+ * <p> <strong>NOTE:</strong> Dialogs are dismissed automatically, unless there is a {@link Page#onDialog Page.onDialog()} listener. When listener is
+ * present, it **must** either {@link Dialog#accept Dialog.accept()} or {@link Dialog#dismiss Dialog.dismiss()} the dialog
+ * - otherwise the page will <a
 * href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/EventLoop#never_blocking">freeze</a> waiting for the
 * dialog, and actions like click will never finish.
 */
 public interface Dialog {
  /**
   * Returns when the dialog has been accepted.
-   *
-   * @since v1.8
   */
  default void accept() {
    accept(null);
@@ -61,37 +58,22 @@ public interface Dialog {
   * Returns when the dialog has been accepted.
   *
   * @param promptText A text to enter in prompt. Does not cause any effects if the dialog's {@code type} is not prompt. Optional.
-   * @since v1.8
   */
  void accept(String promptText);
  /**
   * If dialog is prompt, returns default prompt value. Otherwise, returns empty string.
-   *
-   * @since v1.8
   */
  String defaultValue();
  /**
   * Returns when the dialog has been dismissed.
-   *
-   * @since v1.8
   */
  void dismiss();
  /**
   * A message displayed in the dialog.
-   *
-   * @since v1.8
   */
  String message();
-  /**
-   * The page that initiated this dialog, if available.
-   *
-   * @since v1.34
-   */
-  Page page();
  /**
   * Returns dialog's type, can be one of {@code alert}, {@code beforeunload}, {@code confirm} or {@code prompt}.
-   *
-   * @since v1.8
   */
  String type();
 }
@@ -20,92 +20,73 @@ import java.io.InputStream;
 import java.nio.file.Path;

 /**
- * {@code Download} objects are dispatched by page via the {@link com.microsoft.playwright.Page#onDownload
- * Page.onDownload()} event.
+ * {@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> Download event is emitted once the download starts. Download path becomes available once download completes.
+ * <p> Download event is emitted once the download starts. Download path becomes available once download completes:
 * <pre>{@code
- * // Wait for the download to start
+ * // 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(() -> {
- *     // Perform the action that initiates download
- *     page.getByText("Download file").click();
+ *   page.click("a");
 * });
- *
- * // Wait for the download process to complete and save the downloaded file somewhere
- * download.saveAs(Paths.get("/path/to/save/at/", download.suggestedFilename()));
+ * // wait for download to complete
+ * Path path = download.path();
 * }</pre>
 */
 public interface Download {
  /**
-   * Cancels a download. Will not fail if the download is already finished or canceled. Upon successful cancellations, {@code
-   * download.failure()} would resolve to {@code "canceled"}.
-   *
-   * @since v1.13
+   * Cancels a download. Will not fail if the download is already finished or canceled. Upon successful cancellations,
+   * {@code download.failure()} would resolve to {@code "canceled"}.
   */
  void cancel();
  /**
-   * Returns a readable stream for a successful download, or throws for a failed/canceled download.
-   *
-   * @since v1.8
+   * Returns readable stream for current download or {@code null} if download failed.
   */
  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 for a successful download, or throws for a failed/canceled download. The method will
-   * wait for the download to finish if necessary. The method throws when connected remotely.
+   * 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 com.microsoft.playwright.Download#suggestedFilename
-   * Download.suggestedFilename()} to get suggested file name.
-   *
-   * @since v1.8
+   * <p> Note that the download's file name is a random GUID, use {@link Download#suggestedFilename Download.suggestedFilename()}
+   * to get suggested file name.
   */
  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.
   *
-   * <p> <strong>Usage</strong>
-   * <pre>{@code
-   * download.saveAs(Paths.get("/path/to/save/at/", download.suggestedFilename()));
-   * }</pre>
-   *
   * @param path Path where the download should be copied.
-   * @since v1.8
   */
  void saveAs(Path path);
  /**
   * Returns suggested filename for this download. It is typically computed by the browser from the <a
-   * href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Disposition">{@code Content-Disposition}</a>
-   * response header or the {@code download} attribute. See the spec on <a
+   * href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Disposition">{@code Content-Disposition}</a> response
+   * header or the {@code download} attribute. See the spec on <a
   * href="https://html.spec.whatwg.org/#downloading-resources">whatwg</a>. Different browsers can use different logic for
   * computing it.
-   *
-   * @since v1.8
   */
  String suggestedFilename();
  /**
   * Returns downloaded url.
-   *
-   * @since v1.8
   */
  String url();
 }
@@ -20,10 +20,9 @@ import com.microsoft.playwright.options.*;
 import java.nio.file.Path;

 /**
- * {@code FileChooser} objects are dispatched by the page in the {@link com.microsoft.playwright.Page#onFileChooser
- * Page.onFileChooser()} event.
+ * {@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>
 */
@@ -36,10 +35,9 @@ public interface FileChooser {
     */
    public Boolean noWaitAfter;
    /**
-     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
-     * value can be changed by using the {@link com.microsoft.playwright.BrowserContext#setDefaultTimeout
-     * BrowserContext.setDefaultTimeout()} or {@link com.microsoft.playwright.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;

@@ -53,10 +51,9 @@ public interface FileChooser {
      return this;
    }
    /**
-     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
-     * value can be changed by using the {@link com.microsoft.playwright.BrowserContext#setDefaultTimeout
-     * BrowserContext.setDefaultTimeout()} or {@link com.microsoft.playwright.Page#setDefaultTimeout Page.setDefaultTimeout()}
-     * methods.
+     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be changed by
+     * using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link Page#setDefaultTimeout
+     * Page.setDefaultTimeout()} methods.
     */
    public SetFilesOptions setTimeout(double timeout) {
      this.timeout = timeout;
@@ -65,84 +62,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);
 }
@@ -19,32 +19,27 @@ package com.microsoft.playwright;
 import java.util.*;

 /**
- * JSHandle represents an in-page JavaScript object. JSHandles can be created with the {@link
- * com.microsoft.playwright.Page#evaluateHandle Page.evaluateHandle()} method.
+ * JSHandle represents an in-page JavaScript object. JSHandles can be created with the {@link Page#evaluateHandle
+ * Page.evaluateHandle()} method.
 * <pre>{@code
 * JSHandle windowHandle = page.evaluateHandle("() => window");
 * // ...
 * }</pre>
 *
 * <p> JSHandle prevents the referenced JavaScript object being garbage collected unless the handle is exposed with {@link
- * com.microsoft.playwright.JSHandle#dispose JSHandle.dispose()}. JSHandles are auto-disposed when their origin frame gets
- * navigated or the parent context gets destroyed.
+ * JSHandle#dispose JSHandle.dispose()}. JSHandles are auto-disposed when their origin frame gets navigated or the parent
+ * context gets destroyed.
 *
- * <p> JSHandle instances can be used as an argument in {@link com.microsoft.playwright.Page#evalOnSelector
- * Page.evalOnSelector()}, {@link com.microsoft.playwright.Page#evaluate Page.evaluate()} and {@link
- * com.microsoft.playwright.Page#evaluateHandle Page.evaluateHandle()} methods.
+ * <p> JSHandle instances can be used as an argument in {@link Page#evalOnSelector Page.evalOnSelector()}, {@link Page#evaluate
+ * Page.evaluate()} and {@link Page#evaluateHandle Page.evaluateHandle()} methods.
 */
 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();
  /**
@@ -53,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> <strong>Usage</strong>
+   * <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);
@@ -75,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> <strong>Usage</strong>
+   * <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);
  /**
@@ -95,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 com.microsoft.playwright.Page#evaluateHandle Page.evaluateHandle()} for more details.
+   * <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);
@@ -116,41 +108,35 @@ public interface JSHandle {
   *
   * <p> This method passes this handle as the first argument to {@code expression}.
   *
-   * <p> The only difference between {@code jsHandle.evaluate} and {@code jsHandle.evaluateHandle} is that {@code
-   * jsHandle.evaluateHandle} returns {@code JSHandle}.
+   * <p> The only difference between {@code jsHandle.evaluate} and {@code jsHandle.evaluateHandle} is that {@code jsHandle.evaluateHandle} returns
+   * {@code JSHandle}.
   *
   * <p> If the function passed to the {@code jsHandle.evaluateHandle} returns a <a
-   * href='https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise'>Promise</a>, then {@code
-   * jsHandle.evaluateHandle} would wait for the promise to resolve and return its value.
+   * href='https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise'>Promise</a>, then
+   * {@code jsHandle.evaluateHandle} would wait for the promise to resolve and return its value.
   *
-   * <p> See {@link com.microsoft.playwright.Page#evaluateHandle Page.evaluateHandle()} for more details.
+   * <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> <strong>Usage</strong>
   * <pre>{@code
-   * JSHandle handle = page.evaluateHandle("() => ({ window, document })");
+   * JSHandle handle = page.evaluateHandle("() => ({window, document}"););
   * Map<String, JSHandle> properties = handle.getProperties();
   * JSHandle windowHandle = properties.get("window");
   * JSHandle documentHandle = properties.get("document");
   * handle.dispose();
   * }</pre>
-   *
-   * @since v1.8
   */
  Map<String, JSHandle> getProperties();
  /**
   * Fetches a single property from the referenced object.
   *
   * @param propertyName property to get
-   * @since v1.8
   */
  JSHandle getProperty(String propertyName);
  /**
@@ -158,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();
 }
@@ -19,13 +19,11 @@ package com.microsoft.playwright;
 import com.microsoft.playwright.options.*;

 /**
- * Keyboard provides an api for managing a virtual keyboard. The high level api is {@link
- * com.microsoft.playwright.Keyboard#type Keyboard.type()}, which takes raw characters and generates proper {@code
- * keydown}, {@code keypress}/{@code input}, and {@code keyup} events on your page.
+ * 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 keydown, keypress/input, and keyup events on your page.
 *
- * <p> For finer control, you can use {@link com.microsoft.playwright.Keyboard#down Keyboard.down()}, {@link
- * com.microsoft.playwright.Keyboard#up Keyboard.up()}, and {@link com.microsoft.playwright.Keyboard#insertText
- * Keyboard.insertText()} to manually fire events as if they were generated from a real keyboard.
+ * <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.
 *
 * <p> An example of holding down {@code Shift} in order to select and delete some text:
 * <pre>{@code
@@ -91,75 +89,57 @@ 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}, {@code ControlOrMeta}. {@code ControlOrMeta} resolves to {@code Control} on Windows and Linux and to {@code
-   * Meta} on macOS.
+   * <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 com.microsoft.playwright.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 com.microsoft.playwright.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, use {@link com.microsoft.playwright.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,
+   * use {@link Keyboard#up Keyboard.up()}.
   *
   * <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> <strong>Usage</strong>
   * <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);
  /**
-   * <strong>NOTE:</strong> In most cases, you should use {@link com.microsoft.playwright.Locator#press Locator.press()} instead.
-   *
-   * <p> {@code key} can specify the intended <a
+   * {@code key} can specify the intended <a
   * href="https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key">keyboardEvent.key</a> value or a single
   * 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}, {@code ControlOrMeta}. {@code ControlOrMeta} resolves to {@code Control} on Windows and Linux and to {@code
-   * Meta} on macOS.
+   * <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"}, {@code key: "Control++} 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> <strong>Usage</strong>
+   * <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");
@@ -172,41 +152,31 @@ public interface Keyboard {
   * browser.close();
   * }</pre>
   *
-   * <p> Shortcut for {@link com.microsoft.playwright.Keyboard#down Keyboard.down()} and {@link
-   * com.microsoft.playwright.Keyboard#up Keyboard.up()}.
+   * <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);
  }
  /**
-   * <strong>NOTE:</strong> In most cases, you should use {@link com.microsoft.playwright.Locator#press Locator.press()} instead.
-   *
-   * <p> {@code key} can specify the intended <a
+   * {@code key} can specify the intended <a
   * href="https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key">keyboardEvent.key</a> value or a single
   * 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}, {@code ControlOrMeta}. {@code ControlOrMeta} resolves to {@code Control} on Windows and Linux and to {@code
-   * Meta} on macOS.
+   * <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"}, {@code key: "Control++} 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> <strong>Usage</strong>
+   * <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");
@@ -219,24 +189,15 @@ public interface Keyboard {
   * browser.close();
   * }</pre>
   *
-   * <p> Shortcut for {@link com.microsoft.playwright.Keyboard#down Keyboard.down()} and {@link
-   * com.microsoft.playwright.Keyboard#up Keyboard.up()}.
+   * <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);
  /**
-   * <strong>NOTE:</strong> In most cases, you should use {@link com.microsoft.playwright.Locator#fill Locator.fill()} instead. You only need to
-   * press keys one by one if there is special keyboard handling on the page - in this case use {@link
-   * com.microsoft.playwright.Locator#pressSequentially Locator.pressSequentially()}.
+   * Sends a {@code keydown}, {@code keypress}/{@code input}, and {@code keyup} event for each character in the text.
   *
-   * <p> 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 com.microsoft.playwright.Keyboard#press
-   * Keyboard.press()}.
-   *
-   * <p> <strong>Usage</strong>
+   * <p> To press a special key, like {@code Control} or {@code ArrowDown}, use {@link Keyboard#press Keyboard.press()}.
   * <pre>{@code
   * // Types instantly
   * page.keyboard().type("Hello");
@@ -249,22 +210,14 @@ 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);
  }
  /**
-   * <strong>NOTE:</strong> In most cases, you should use {@link com.microsoft.playwright.Locator#fill Locator.fill()} instead. You only need to
-   * press keys one by one if there is special keyboard handling on the page - in this case use {@link
-   * com.microsoft.playwright.Locator#pressSequentially Locator.pressSequentially()}.
+   * Sends a {@code keydown}, {@code keypress}/{@code input}, and {@code keyup} event for each character in the text.
   *
-   * <p> 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 com.microsoft.playwright.Keyboard#press
-   * Keyboard.press()}.
-   *
-   * <p> <strong>Usage</strong>
+   * <p> To press a special key, like {@code Control} or {@code ArrowDown}, use {@link Keyboard#press Keyboard.press()}.
   * <pre>{@code
   * // Types instantly
   * page.keyboard().type("Hello");
@@ -277,14 +230,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);
 }
@@ -21,7 +21,7 @@ import com.microsoft.playwright.options.*;
 /**
 * The Mouse class operates in main-frame CSS pixels relative to the top-left corner of the viewport.
 *
- * <p> Every {@code page} object has its own Mouse, accessible with {@link com.microsoft.playwright.Page#mouse Page.mouse()}.
+ * <p> Every {@code page} object has its own Mouse, accessible with {@link Page#mouse Page.mouse()}.
 * <pre>{@code
 * // Using ‘page.mouse’ to trace a 100x100 square.
 * page.mouse().move(0, 0);
@@ -160,91 +160,65 @@ public interface Mouse {
    }
  }
  /**
-   * Shortcut for {@link com.microsoft.playwright.Mouse#move Mouse.move()}, {@link com.microsoft.playwright.Mouse#down
-   * Mouse.down()}, {@link com.microsoft.playwright.Mouse#up Mouse.up()}.
-   *
-   * @since v1.8
+   * Shortcut for {@link Mouse#move Mouse.move()}, {@link Mouse#down Mouse.down()}, {@link Mouse#up Mouse.up()}.
   */
  default void click(double x, double y) {
    click(x, y, null);
  }
  /**
-   * Shortcut for {@link com.microsoft.playwright.Mouse#move Mouse.move()}, {@link com.microsoft.playwright.Mouse#down
-   * Mouse.down()}, {@link com.microsoft.playwright.Mouse#up Mouse.up()}.
-   *
-   * @since v1.8
+   * Shortcut for {@link Mouse#move Mouse.move()}, {@link Mouse#down Mouse.down()}, {@link Mouse#up Mouse.up()}.
   */
  void click(double x, double y, ClickOptions options);
  /**
-   * Shortcut for {@link com.microsoft.playwright.Mouse#move Mouse.move()}, {@link com.microsoft.playwright.Mouse#down
-   * Mouse.down()}, {@link com.microsoft.playwright.Mouse#up Mouse.up()}, {@link com.microsoft.playwright.Mouse#down
-   * Mouse.down()} and {@link com.microsoft.playwright.Mouse#up Mouse.up()}.
-   *
-   * @since v1.8
+   * 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()}.
   */
  default void dblclick(double x, double y) {
    dblclick(x, y, null);
  }
  /**
-   * Shortcut for {@link com.microsoft.playwright.Mouse#move Mouse.move()}, {@link com.microsoft.playwright.Mouse#down
-   * Mouse.down()}, {@link com.microsoft.playwright.Mouse#up Mouse.up()}, {@link com.microsoft.playwright.Mouse#down
-   * Mouse.down()} and {@link com.microsoft.playwright.Mouse#up Mouse.up()}.
-   *
-   * @since v1.8
+   * 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()}.
   */
  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. This method is usually used to manually scroll the page. See <a
-   * href="https://playwright.dev/java/docs/input#scrolling">scrolling</a> for alternative ways to scroll.
+   * 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);
 }
@@ -58,53 +58,39 @@ public interface Playwright extends AutoCloseable {
  }
  /**
   * This object can be used to launch or connect to Chromium, returning instances of {@code Browser}.
-   *
-   * @since v1.8
   */
  BrowserType chromium();
  /**
   * This object can be used to launch or connect to Firefox, returning instances of {@code Browser}.
-   *
-   * @since v1.8
   */
  BrowserType firefox();
  /**
   * Exposes API that can be used for the Web API testing.
-   *
-   * @since v1.16
   */
  APIRequest request();
  /**
   * Selectors can be used to install custom selector engines. See <a
-   * href="https://playwright.dev/java/docs/extensibility">extensibility</a> for more information.
-   *
-   * @since v1.8
+   * href="https://playwright.dev/java/docs/selectors">Working with selectors</a> for more information.
   */
  Selectors selectors();
  /**
   * This object can be used to launch or connect to WebKit, returning instances of {@code Browser}.
-   *
-   * @since v1.8
   */
  BrowserType webkit();
  /**
   * Terminates this instance of Playwright, will also close all created browsers if they are still running.
-   *
-   * @since v1.9
   */
  void close();
  /**
-   * Launches new Playwright driver process and connects to it. {@link com.microsoft.playwright.Playwright#close
-   * Playwright.close()} should be called when the instance is no longer needed.
+   * Launches new Playwright driver process and connects to it. {@link Playwright#close Playwright.close()} should be called
+   * when the instance is no longer needed.
   * <pre>{@code
-   * Playwright playwright = Playwright.create();
+   * Playwright playwright = Playwright.create()) {
   * Browser browser = playwright.webkit().launch();
   * Page page = browser.newPage();
   * page.navigate("https://www.w3.org/");
   * playwright.close();
   * }</pre>
-   *
-   * @since v1.10
   */
  static Playwright create(CreateOptions options) {
    return PlaywrightImpl.create(options);
@@ -22,124 +22,80 @@ import java.util.*;
 /**
 * Whenever the page sends a request for a network resource the following sequence of events are emitted by {@code Page}:
 * <ul>
- * <li> {@link com.microsoft.playwright.Page#onRequest Page.onRequest()} emitted when the request is issued by the page.</li>
- * <li> {@link com.microsoft.playwright.Page#onResponse Page.onResponse()} emitted when/if the response status and headers are
- * received for the request.</li>
- * <li> {@link com.microsoft.playwright.Page#onRequestFinished Page.onRequestFinished()} emitted when the response body is
- * downloaded and the request is complete.</li>
+ * <li> {@link Page#onRequest Page.onRequest()} emitted when the request is issued by the page.</li>
+ * <li> {@link Page#onResponse Page.onResponse()} emitted when/if the response status and headers are received for the request.</li>
+ * <li> {@link Page#onRequestFinished Page.onRequestFinished()} emitted when the response body is downloaded and the request is
+ * complete.</li>
 * </ul>
 *
- * <p> If request fails at some point, then instead of {@code "requestfinished"} event (and possibly instead of 'response'
- * event), the  {@link com.microsoft.playwright.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> <strong>Usage</strong>
-   *
   * <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.
-   *
-   * <p> <strong>Usage</strong>
-   * <pre>{@code
-   * String frameUrl = request.frame().url();
-   * }</pre>
-   *
-   * <p> <strong>Details</strong>
-   *
-   * <p> Note that in some cases the frame is not available, and this method will throw.
-   * <ul>
-   * <li> When request originates in the Service Worker. You can use {@code request.serviceWorker()} to check that.</li>
-   * <li> When navigation request is issued before the corresponding frame is created. You can use {@link
-   * com.microsoft.playwright.Request#isNavigationRequest Request.isNavigationRequest()} to check that.</li>
-   * </ul>
-   *
-   * <p> Here is an example that handles all the cases:
-   *
-   * @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 com.microsoft.playwright.Request#allHeaders
-   * Request.allHeaders()} for complete list of headers that include {@code cookie} information.
-   *
-   * @since v1.8
+   * **DEPRECATED** Incomplete list of headers as seen by the rendering engine. Use {@link Request#allHeaders
+   * Request.allHeaders()} instead.
   */
  Map<String, String> headers();
  /**
-   * An array with all the request HTTP headers associated with this request. Unlike {@link
-   * com.microsoft.playwright.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
+   * 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.
   */
  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.
-   *
-   * <p> Some navigation requests are issued before the corresponding frame is created, and therefore do not have {@link
-   * com.microsoft.playwright.Request#frame Request.frame()} available.
-   *
-   * @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> <strong>Usage</strong>
+   * <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
@@ -152,49 +108,35 @@ public interface Request {
   * Response response = page.navigate("https://google.com");
   * System.out.println(response.request().redirectedFrom()); // null
   * }</pre>
-   *
-   * @since v1.8
   */
  Request redirectedFrom();
  /**
   * New request issued by the browser if the server responded with redirect.
   *
-   * <p> <strong>Usage</strong>
-   *
-   * <p> This method is the opposite of {@link com.microsoft.playwright.Request#redirectedFrom Request.redirectedFrom()}:
+   * <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> <strong>Usage</strong>
   * <pre>{@code
   * page.onRequestFinished(request -> {
   *   Timing timing = request.timing();
@@ -202,14 +144,10 @@ public interface Request {
   * });
   * page.navigate("http://example.com");
   * }</pre>
-   *
-   * @since v1.8
   */
  Timing timing();
  /**
   * URL of the request.
-   *
-   * @since v1.8
   */
  String url();
 }
@@ -25,113 +25,75 @@ import java.util.*;
 public interface Response {
  /**
   * An object with all the response HTTP headers associated with this response.
-   *
-   * @since v1.15
   */
  Map<String, String> allHeaders();
  /**
   * Returns the buffer with response body.
-   *
-   * @since v1.8
   */
  byte[] body();
  /**
   * Waits for this response to finish, returns always {@code null}.
-   *
-   * @since v1.8
   */
  String finished();
  /**
   * Returns the {@code Frame} that initiated this response.
-   *
-   * @since v1.8
   */
  Frame frame();
  /**
-   * Indicates whether this Response was fulfilled by a Service Worker's Fetch Handler (i.e. via <a
-   * href="https://developer.mozilla.org/en-US/docs/Web/API/FetchEvent/respondWith">FetchEvent.respondWith</a>).
-   *
-   * @since v1.23
-   */
-  boolean fromServiceWorker();
-  /**
-   * An object with the response HTTP headers. The header names are lower-cased. Note that this method does not return
-   * security-related headers, including cookie-related ones. You can use {@link com.microsoft.playwright.Response#allHeaders
-   * Response.allHeaders()} for complete list of headers that include {@code cookie} information.
-   *
-   * @since v1.8
+   * **DEPRECATED** Incomplete list of headers as seen by the rendering engine. Use {@link Response#allHeaders
+   * Response.allHeaders()} instead.
   */
  Map<String, String> headers();
  /**
-   * An array with all the request HTTP headers associated with this response. Unlike {@link
-   * com.microsoft.playwright.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
+   * 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.
   */
  List<HttpHeader> headersArray();
  /**
   * Returns the value of the header matching the name. The name is case insensitive. If multiple headers have the same name
-   * (except {@code set-cookie}), they are returned as a list separated by {@code , }. For {@code set-cookie}, the {@code \n}
-   * separator is used. If no headers are found, {@code null} is returned.
+   * (except {@code set-cookie}), they are returned as a list separated by {@code , }. For {@code set-cookie}, the {@code \n} separator is used. If
+   * no headers are found, {@code null} is returned.
   *
   * @param name Name of the header.
-   * @since v1.15
   */
  String headerValue(String name);
  /**
   * Returns all values of the headers matching the name, for example {@code set-cookie}. The name is case insensitive.
   *
   * @param name Name of the header.
-   * @since v1.15
   */
  List<String> headerValues(String name);
  /**
   * Contains a boolean stating whether the response was successful (status in the range 200-299) or not.
-   *
-   * @since v1.8
   */
  boolean ok();
  /**
   * Returns the matching {@code Request} object.
-   *
-   * @since v1.8
   */
  Request request();
  /**
   * Returns SSL and other security information.
-   *
-   * @since v1.13
   */
  SecurityDetails securityDetails();
  /**
   * Returns the IP address and port of the server.
-   *
-   * @since v1.13
   */
  ServerAddr serverAddr();
  /**
   * Contains the status code of the response (e.g., 200 for a success).
-   *
-   * @since v1.8
   */
  int status();
  /**
   * Contains the status text of the response (e.g. usually an "OK" for a success).
-   *
-   * @since v1.8
   */
  String statusText();
  /**
   * Returns the text representation of response body.
-   *
-   * @since v1.8
   */
  String text();
  /**
   * Contains the URL of the response.
-   *
-   * @since v1.8
   */
  String url();
 }
@@ -20,11 +20,8 @@ import java.nio.file.Path;
 import java.util.*;

 /**
- * Whenever a network route is set up with {@link com.microsoft.playwright.Page#route Page.route()} or {@link
- * com.microsoft.playwright.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>.
+ * 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.
 */
 public interface Route {
  class ResumeOptions {
@@ -33,11 +30,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;
    /**
@@ -53,21 +50,21 @@ public interface Route {
      return this;
    }
    /**
-     * If set changes the request method (e.g. GET or POST).
+     * If set changes the request method (e.g. GET or POST)
     */
    public ResumeOptions setMethod(String method) {
      this.method = method;
      return this;
    }
    /**
-     * If set changes the post data of request.
+     * If set changes the post data of request
     */
    public ResumeOptions setPostData(String postData) {
      this.postData = postData;
      return this;
    }
    /**
-     * If set changes the post data of request.
+     * If set changes the post data of request
     */
    public ResumeOptions setPostData(byte[] postData) {
      this.postData = postData;
@@ -81,140 +78,6 @@ public interface Route {
      return this;
    }
  }
-  class FallbackOptions {
-    /**
-     * If set changes the request HTTP headers. Header values will be converted to a string.
-     */
-    public Map<String, String> headers;
-    /**
-     * If set changes the request method (e.g. GET or POST).
-     */
-    public String method;
-    /**
-     * If set changes the post data of request.
-     */
-    public Object postData;
-    /**
-     * If set changes the request URL. New URL must have same protocol as original one. Changing the URL won't affect the route
-     * matching, all the routes are matched using the original request URL.
-     */
-    public String url;
-
-    /**
-     * If set changes the request HTTP headers. Header values will be converted to a string.
-     */
-    public FallbackOptions setHeaders(Map<String, String> headers) {
-      this.headers = headers;
-      return this;
-    }
-    /**
-     * If set changes the request method (e.g. GET or POST).
-     */
-    public FallbackOptions setMethod(String method) {
-      this.method = method;
-      return this;
-    }
-    /**
-     * If set changes the post data of request.
-     */
-    public FallbackOptions setPostData(String postData) {
-      this.postData = postData;
-      return this;
-    }
-    /**
-     * If set changes the post data of request.
-     */
-    public FallbackOptions setPostData(byte[] postData) {
-      this.postData = postData;
-      return this;
-    }
-    /**
-     * If set changes the request URL. New URL must have same protocol as original one. Changing the URL won't affect the route
-     * matching, all the routes are matched using the original request URL.
-     */
-    public FallbackOptions setUrl(String url) {
-      this.url = url;
-      return this;
-    }
-  }
-  class FetchOptions {
-    /**
-     * If set changes the request HTTP headers. Header values will be converted to a string.
-     */
-    public Map<String, String> headers;
-    /**
-     * Maximum number of request redirects that will be followed automatically. An error will be thrown if the number is
-     * exceeded. Defaults to {@code 20}. Pass {@code 0} to not follow redirects.
-     */
-    public Integer maxRedirects;
-    /**
-     * If set changes the request method (e.g. GET or POST).
-     */
-    public String method;
-    /**
-     * If set changes the post data of request.
-     */
-    public Object postData;
-    /**
-     * Request timeout in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout.
-     */
-    public Double timeout;
-    /**
-     * If set changes the request URL. New URL must have same protocol as original one.
-     */
-    public String url;
-
-    /**
-     * If set changes the request HTTP headers. Header values will be converted to a string.
-     */
-    public FetchOptions setHeaders(Map<String, String> headers) {
-      this.headers = headers;
-      return this;
-    }
-    /**
-     * Maximum number of request redirects that will be followed automatically. An error will be thrown if the number is
-     * exceeded. Defaults to {@code 20}. Pass {@code 0} to not follow redirects.
-     */
-    public FetchOptions setMaxRedirects(int maxRedirects) {
-      this.maxRedirects = maxRedirects;
-      return this;
-    }
-    /**
-     * If set changes the request method (e.g. GET or POST).
-     */
-    public FetchOptions setMethod(String method) {
-      this.method = method;
-      return this;
-    }
-    /**
-     * If set changes the post data of request.
-     */
-    public FetchOptions setPostData(String postData) {
-      this.postData = postData;
-      return this;
-    }
-    /**
-     * If set changes the post data of request.
-     */
-    public FetchOptions setPostData(byte[] postData) {
-      this.postData = postData;
-      return this;
-    }
-    /**
-     * Request timeout in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout.
-     */
-    public FetchOptions setTimeout(double timeout) {
-      this.timeout = timeout;
-      return this;
-    }
-    /**
-     * If set changes the request URL. New URL must have same protocol as original one.
-     */
-    public FetchOptions setUrl(String url) {
-      this.url = url;
-      return this;
-    }
-  }
  class FulfillOptions {
    /**
     * Optional response body as text.
@@ -233,13 +96,13 @@ 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.
+     * {@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;
    /**
@@ -276,16 +139,16 @@ public interface Route {
      return this;
    }
    /**
-     * File path to respond with. The content type will be inferred from file extension. If {@code path} is a relative path,
-     * then it is resolved relative to the current working directory.
+     * File path to respond with. The content type will be inferred from file extension. If {@code path} is a relative path, then it
+     * is resolved relative to the current working directory.
     */
    public FulfillOptions setPath(Path path) {
      this.path = path;
      return this;
    }
    /**
-     * {@code APIResponse} to fulfill route's request with. Individual fields of the response (such as headers) can be
-     * overridden using fulfill options.
+     * {@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;
@@ -301,8 +164,6 @@ public interface Route {
  }
  /**
   * Aborts the route's request.
-   *
-   * @since v1.8
   */
  default void abort() {
    abort(null);
@@ -314,11 +175,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>
@@ -329,246 +190,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> <strong>Usage</strong>
   * <pre>{@code
   * page.route("**\/*", route -> {
   *   // Override headers
   *   Map<String, String> headers = new HashMap<>(route.request().headers());
-   *   headers.put("foo", "foo-value"); // set "foo" header
-   *   headers.remove("bar"); // remove "bar" header
+   *   headers.put("foo", "bar"); // set "foo" header
+   *   headers.remove("origin"); // remove "origin" header
   *   route.resume(new Route.ResumeOptions().setHeaders(headers));
   * });
   * }</pre>
-   *
-   * <p> <strong>Details</strong>
-   *
-   * <p> Note that any overrides such as {@code url} or {@code headers} only apply to the request being routed. If this request
-   * results in a redirect, overrides will not be applied to the new redirected request. If you want to propagate a header
-   * through redirects, use the combination of {@link com.microsoft.playwright.Route#fetch Route.fetch()} and {@link
-   * com.microsoft.playwright.Route#fulfill Route.fulfill()} instead.
-   *
-   * @since v1.8
   */
  default void resume() {
    resume(null);
  }
  /**
   * Continues route's request with optional overrides.
-   *
-   * <p> <strong>Usage</strong>
   * <pre>{@code
   * page.route("**\/*", route -> {
   *   // Override headers
   *   Map<String, String> headers = new HashMap<>(route.request().headers());
-   *   headers.put("foo", "foo-value"); // set "foo" header
-   *   headers.remove("bar"); // remove "bar" header
+   *   headers.put("foo", "bar"); // set "foo" header
+   *   headers.remove("origin"); // remove "origin" header
   *   route.resume(new Route.ResumeOptions().setHeaders(headers));
   * });
   * }</pre>
-   *
-   * <p> <strong>Details</strong>
-   *
-   * <p> Note that any overrides such as {@code url} or {@code headers} only apply to the request being routed. If this request
-   * results in a redirect, overrides will not be applied to the new redirected request. If you want to propagate a header
-   * through redirects, use the combination of {@link com.microsoft.playwright.Route#fetch Route.fetch()} and {@link
-   * com.microsoft.playwright.Route#fulfill Route.fulfill()} instead.
-   *
-   * @since v1.8
   */
  void resume(ResumeOptions options);
-  /**
-   * When several routes match the given pattern, they run in the order opposite to their registration. That way the last
-   * registered route can always override all the previous ones. In the example below, request will be handled by the
-   * bottom-most handler first, then it'll fall back to the previous one and in the end will be aborted by the first
-   * registered route.
-   *
-   * <p> <strong>Usage</strong>
-   * <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> <strong>Usage</strong>
-   * <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> <strong>Usage</strong>
-   * <pre>{@code
-   * page.route("https://dog.ceo/api/breeds/list/all", route -> {
-   *   APIResponse response = route.fetch();
-   *   JsonObject json = new Gson().fromJson(response.text(), JsonObject.class);
-   *   JsonObject message = itemObj.get("json").getAsJsonObject();
-   *   message.set("big_red_dog", new JsonArray());
-   *   route.fulfill(new Route.FulfillOptions()
-   *     .setResponse(response)
-   *     .setBody(json.toString()));
-   * });
-   * }</pre>
-   *
-   * <p> <strong>Details</strong>
-   *
-   * <p> Note that {@code headers} option will apply to the fetched request as well as any redirects initiated by it. If you want
-   * to only apply {@code headers} to the original request, but not to redirects, look into {@link
-   * com.microsoft.playwright.Route#resume Route.resume()} instead.
-   *
-   * @since v1.29
-   */
-  default APIResponse fetch() {
-    return fetch(null);
-  }
-  /**
-   * Performs the request and fetches result without fulfilling it, so that the response could be modified and then
-   * fulfilled.
-   *
-   * <p> <strong>Usage</strong>
-   * <pre>{@code
-   * page.route("https://dog.ceo/api/breeds/list/all", route -> {
-   *   APIResponse response = route.fetch();
-   *   JsonObject json = new Gson().fromJson(response.text(), JsonObject.class);
-   *   JsonObject message = itemObj.get("json").getAsJsonObject();
-   *   message.set("big_red_dog", new JsonArray());
-   *   route.fulfill(new Route.FulfillOptions()
-   *     .setResponse(response)
-   *     .setBody(json.toString()));
-   * });
-   * }</pre>
-   *
-   * <p> <strong>Details</strong>
-   *
-   * <p> Note that {@code headers} option will apply to the fetched request as well as any redirects initiated by it. If you want
-   * to only apply {@code headers} to the original request, but not to redirects, look into {@link
-   * com.microsoft.playwright.Route#resume Route.resume()} instead.
-   *
-   * @since v1.29
-   */
-  APIResponse fetch(FetchOptions options);
  /**
   * Fulfills route's request with given response.
   *
-   * <p> <strong>Usage</strong>
-   *
   * <p> An example of fulfilling all requests with 404 responses:
   * <pre>{@code
   * page.route("**\/*", route -> {
@@ -584,8 +238,6 @@ public interface Route {
   * page.route("**\/xhr_endpoint", route -> route.fulfill(
   *   new Route.FulfillOptions().setPath(Paths.get("mock_data.json"))));
   * }</pre>
-   *
-   * @since v1.8
   */
  default void fulfill() {
    fulfill(null);
@@ -593,8 +245,6 @@ public interface Route {
  /**
   * Fulfills route's request with given response.
   *
-   * <p> <strong>Usage</strong>
-   *
   * <p> An example of fulfilling all requests with 404 responses:
   * <pre>{@code
   * page.route("**\/*", route -> {
@@ -610,14 +260,10 @@ public interface Route {
   * page.route("**\/xhr_endpoint", route -> route.fulfill(
   *   new Route.FulfillOptions().setPath(Paths.get("mock_data.json"))));
   * }</pre>
-   *
-   * @since v1.8
   */
  void fulfill(FulfillOptions options);
  /**
   * A request to be routed.
-   *
-   * @since v1.8
   */
  Request request();
 }
@@ -20,21 +20,21 @@ import java.nio.file.Path;

 /**
 * Selectors can be used to install custom selector engines. See <a
- * href="https://playwright.dev/java/docs/extensibility">extensibility</a> for more information.
+ * href="https://playwright.dev/java/docs/selectors">Working with selectors</a> for more information.
 */
 public interface Selectors {
  class RegisterOptions {
    /**
     * Whether to run this selector engine in isolated JavaScript environment. This environment has access to the same DOM, but
-     * not any JavaScript objects from the frame's scripts. Defaults to {@code false}. Note that running as a content script is
-     * not guaranteed when this engine is used together with other registered engines.
+     * not any JavaScript objects from the frame's scripts. Defaults to {@code false}. Note that running as a content script is not
+     * guaranteed when this engine is used together with other registered engines.
     */
    public Boolean contentScript;

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

@@ -24,11 +24,6 @@ package com.microsoft.playwright;
 public interface Touchscreen {
  /**
   * Dispatches a {@code touchstart} and {@code touchend} event with a single touch at the position ({@code x},{@code y}).
-   *
-   * <p> <strong>NOTE:</strong> {@link com.microsoft.playwright.Page#tap Page.tap()} the method will throw if {@code hasTouch} option of the browser
-   * context is false.
-   *
-   * @since v1.8
   */
  void tap(double x, double y);
 }
@@ -38,10 +38,8 @@ import java.nio.file.Path;
 public interface Tracing {
  class StartOptions {
    /**
-     * If specified, intermediate trace files are going to be saved into the files with the given name prefix inside the {@code
-     * tracesDir} folder specified in {@link com.microsoft.playwright.BrowserType#launch BrowserType.launch()}. To specify the
-     * final trace zip file name, you need to pass {@code path} option to {@link com.microsoft.playwright.Tracing#stop
-     * Tracing.stop()} instead.
+     * 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;
    /**
@@ -58,8 +56,8 @@ public interface Tracing {
    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).
+     * provided via {@code PLAYWRIGHT_JAVA_SRC} environment variable (the paths should be separated by ';' on Windows and by ':' on
+     * other platforms).
     */
    public Boolean sources;
    /**
@@ -68,10 +66,8 @@ public interface Tracing {
    public String title;

    /**
-     * If specified, intermediate trace files are going to be saved into the files with the given name prefix inside the {@code
-     * tracesDir} folder specified in {@link com.microsoft.playwright.BrowserType#launch BrowserType.launch()}. To specify the
-     * final trace zip file name, you need to pass {@code path} option to {@link com.microsoft.playwright.Tracing#stop
-     * Tracing.stop()} instead.
+     * 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;
@@ -97,8 +93,8 @@ public interface Tracing {
    }
    /**
     * 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).
+     * 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;
@@ -113,28 +109,11 @@ public interface Tracing {
    }
  }
  class StartChunkOptions {
-    /**
-     * If specified, intermediate trace files are going to be saved into the files with the given name prefix inside the {@code
-     * tracesDir} folder specified in {@link com.microsoft.playwright.BrowserType#launch BrowserType.launch()}. To specify the
-     * final trace zip file name, you need to pass {@code path} option to {@link com.microsoft.playwright.Tracing#stopChunk
-     * Tracing.stopChunk()} instead.
-     */
-    public String name;
    /**
     * Trace name to be shown in the Trace Viewer.
     */
    public String title;

-    /**
-     * If specified, intermediate trace files are going to be saved into the files with the given name prefix inside the {@code
-     * tracesDir} folder specified in {@link com.microsoft.playwright.BrowserType#launch BrowserType.launch()}. To specify the
-     * final trace zip file name, you need to pass {@code path} option to {@link com.microsoft.playwright.Tracing#stopChunk
-     * Tracing.stopChunk()} instead.
-     */
-    public StartChunkOptions setName(String name) {
-      this.name = name;
-      return this;
-    }
    /**
     * Trace name to be shown in the Trace Viewer.
     */
@@ -159,14 +138,14 @@ public interface Tracing {
  }
  class StopChunkOptions {
    /**
-     * Export trace collected since the last {@link com.microsoft.playwright.Tracing#startChunk Tracing.startChunk()} call into
-     * the file with the given path.
+     * 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 com.microsoft.playwright.Tracing#startChunk Tracing.startChunk()} call into
-     * the file with the given 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;
@@ -175,8 +154,6 @@ public interface Tracing {
  }
  /**
   * Start tracing.
-   *
-   * <p> <strong>Usage</strong>
   * <pre>{@code
   * context.tracing().start(new Tracing.StartOptions()
   *   .setScreenshots(true)
@@ -186,16 +163,12 @@ public interface Tracing {
   * context.tracing().stop(new Tracing.StopOptions()
   *   .setPath(Paths.get("trace.zip")));
   * }</pre>
-   *
-   * @since v1.12
   */
  default void start() {
    start(null);
  }
  /**
   * Start tracing.
-   *
-   * <p> <strong>Usage</strong>
   * <pre>{@code
   * context.tracing().start(new Tracing.StartOptions()
   *   .setScreenshots(true)
@@ -205,17 +178,12 @@ public interface Tracing {
   * context.tracing().stop(new Tracing.StopOptions()
   *   .setPath(Paths.get("trace.zip")));
   * }</pre>
-   *
-   * @since v1.12
   */
  void start(StartOptions options);
  /**
-   * Start a new trace chunk. If you'd like to record multiple traces on the same {@code BrowserContext}, use {@link
-   * com.microsoft.playwright.Tracing#start Tracing.start()} once, and then create multiple trace chunks with {@link
-   * com.microsoft.playwright.Tracing#startChunk Tracing.startChunk()} and {@link com.microsoft.playwright.Tracing#stopChunk
-   * Tracing.stopChunk()}.
-   *
-   * <p> <strong>Usage</strong>
+   * Start a new trace chunk. If you'd like to record multiple traces on the same {@code BrowserContext}, use {@link Tracing#start
+   * Tracing.start()} once, and then create multiple trace chunks with {@link Tracing#startChunk Tracing.startChunk()} and
+   * {@link Tracing#stopChunk Tracing.stopChunk()}.
   * <pre>{@code
   * context.tracing().start(new Tracing.StartOptions()
   *   .setScreenshots(true)
@@ -224,7 +192,7 @@ public interface Tracing {
   * page.navigate("https://playwright.dev");
   *
   * context.tracing().startChunk();
-   * page.getByText("Get Started").click();
+   * page.click("text=Get Started");
   * // Everything between startChunk and stopChunk will be recorded in the trace.
   * context.tracing().stopChunk(new Tracing.StopChunkOptions()
   *   .setPath(Paths.get("trace1.zip")));
@@ -235,19 +203,14 @@ public interface Tracing {
   * context.tracing().stopChunk(new Tracing.StopChunkOptions()
   *   .setPath(Paths.get("trace2.zip")));
   * }</pre>
-   *
-   * @since v1.15
   */
  default void startChunk() {
    startChunk(null);
  }
  /**
-   * Start a new trace chunk. If you'd like to record multiple traces on the same {@code BrowserContext}, use {@link
-   * com.microsoft.playwright.Tracing#start Tracing.start()} once, and then create multiple trace chunks with {@link
-   * com.microsoft.playwright.Tracing#startChunk Tracing.startChunk()} and {@link com.microsoft.playwright.Tracing#stopChunk
-   * Tracing.stopChunk()}.
-   *
-   * <p> <strong>Usage</strong>
+   * Start a new trace chunk. If you'd like to record multiple traces on the same {@code BrowserContext}, use {@link Tracing#start
+   * Tracing.start()} once, and then create multiple trace chunks with {@link Tracing#startChunk Tracing.startChunk()} and
+   * {@link Tracing#stopChunk Tracing.stopChunk()}.
   * <pre>{@code
   * context.tracing().start(new Tracing.StartOptions()
   *   .setScreenshots(true)
@@ -256,7 +219,7 @@ public interface Tracing {
   * page.navigate("https://playwright.dev");
   *
   * context.tracing().startChunk();
-   * page.getByText("Get Started").click();
+   * page.click("text=Get Started");
   * // Everything between startChunk and stopChunk will be recorded in the trace.
   * context.tracing().stopChunk(new Tracing.StopChunkOptions()
   *   .setPath(Paths.get("trace1.zip")));
@@ -267,38 +230,26 @@ public interface Tracing {
   * context.tracing().stopChunk(new Tracing.StopChunkOptions()
   *   .setPath(Paths.get("trace2.zip")));
   * }</pre>
-   *
-   * @since v1.15
   */
  void startChunk(StartChunkOptions options);
  /**
   * Stop tracing.
-   *
-   * @since v1.12
   */
  default void stop() {
    stop(null);
  }
  /**
   * Stop tracing.
-   *
-   * @since v1.12
   */
  void stop(StopOptions options);
  /**
-   * Stop the trace chunk. See {@link com.microsoft.playwright.Tracing#startChunk Tracing.startChunk()} for more details
-   * about multiple trace chunks.
-   *
-   * @since v1.15
+   * Stop the trace chunk. See {@link Tracing#startChunk Tracing.startChunk()} for more details about multiple trace chunks.
   */
  default void stopChunk() {
    stopChunk(null);
  }
  /**
-   * Stop the trace chunk. See {@link com.microsoft.playwright.Tracing#startChunk Tracing.startChunk()} for more details
-   * about multiple trace chunks.
-   *
-   * @since v1.15
+   * Stop the trace chunk. See {@link Tracing#startChunk Tracing.startChunk()} for more details about multiple trace chunks.
   */
  void stopChunk(StopChunkOptions options);
 }
@@ -27,15 +27,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 +39,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);
 }
@@ -1,47 +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;
-
-
-/**
- * {@code WebError} class represents an unhandled exception thrown in the page. It is dispatched via the {@link
- * com.microsoft.playwright.BrowserContext#onWebError BrowserContext.onWebError()} event.
- * <pre>{@code
- * // Log all uncaught errors to the terminal
- * context.onWebError(webError -> {
- *   System.out.println("Uncaught exception: " + webError.error());
- * });
- *
- * // Navigate to a page with an exception.
- * page.navigate("data:text/html,<script>throw new Error('Test')</script>");
- * }</pre>
- */
-public interface WebError {
-  /**
-   * The page that produced this unhandled exception, if any.
-   *
-   * @since v1.38
-   */
-  Page page();
-  /**
-   * Unhandled error that was thrown.
-   *
-   * @since v1.38
-   */
-  String error();
-}
-
@@ -66,9 +66,8 @@ public interface WebSocket {
     */
    public Predicate<WebSocketFrame> predicate;
    /**
-     * Maximum time to wait for in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The
-     * default value can be changed by using the {@link com.microsoft.playwright.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;

@@ -80,9 +79,8 @@ public interface WebSocket {
      return this;
    }
    /**
-     * Maximum time to wait for in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The
-     * default value can be changed by using the {@link com.microsoft.playwright.BrowserContext#setDefaultTimeout
-     * BrowserContext.setDefaultTimeout()}.
+     * Maximum time to wait for in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()}.
     */
    public WaitForFrameReceivedOptions setTimeout(double timeout) {
      this.timeout = timeout;
@@ -95,9 +93,8 @@ public interface WebSocket {
     */
    public Predicate<WebSocketFrame> predicate;
    /**
-     * Maximum time to wait for in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The
-     * default value can be changed by using the {@link com.microsoft.playwright.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;

@@ -109,9 +106,8 @@ public interface WebSocket {
      return this;
    }
    /**
-     * Maximum time to wait for in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The
-     * default value can be changed by using the {@link com.microsoft.playwright.BrowserContext#setDefaultTimeout
-     * BrowserContext.setDefaultTimeout()}.
+     * Maximum time to wait for in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()}.
     */
    public WaitForFrameSentOptions setTimeout(double timeout) {
      this.timeout = timeout;
@@ -120,54 +116,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);
 }
@@ -18,21 +18,17 @@ package com.microsoft.playwright;


 /**
- * The {@code WebSocketFrame} class represents frames sent over {@code WebSocket} connections in the page. Frame payload is
- * returned by either {@link com.microsoft.playwright.WebSocketFrame#text WebSocketFrame.text()} or {@link
- * com.microsoft.playwright.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();
 }
@@ -20,8 +20,8 @@ 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,16 +46,14 @@ public interface Worker {

  class WaitForCloseOptions {
    /**
-     * Maximum time to wait for in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The
-     * default value can be changed by using the {@link com.microsoft.playwright.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 com.microsoft.playwright.BrowserContext#setDefaultTimeout
-     * BrowserContext.setDefaultTimeout()}.
+     * Maximum time to wait for in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()}.
     */
    public WaitForCloseOptions setTimeout(double timeout) {
      this.timeout = timeout;
@@ -65,18 +63,16 @@ public interface Worker {
  /**
   * Returns the return value of {@code expression}.
   *
-   * <p> If the function passed to the {@link com.microsoft.playwright.Worker#evaluate Worker.evaluate()} returns a <a
+   * <p> If the function passed to the {@link Worker#evaluate Worker.evaluate()} returns a <a
   * href='https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise'>Promise</a>, then {@link
-   * com.microsoft.playwright.Worker#evaluate Worker.evaluate()} would wait for the promise to resolve and return its value.
+   * Worker#evaluate Worker.evaluate()} would wait for the promise to resolve and return its value.
   *
-   * <p> If the function passed to the {@link com.microsoft.playwright.Worker#evaluate Worker.evaluate()} returns a
-   * non-[Serializable] value, then {@link com.microsoft.playwright.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}.
+   * <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}.
   *
-   * @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);
@@ -84,36 +80,31 @@ public interface Worker {
  /**
   * Returns the return value of {@code expression}.
   *
-   * <p> If the function passed to the {@link com.microsoft.playwright.Worker#evaluate Worker.evaluate()} returns a <a
+   * <p> If the function passed to the {@link Worker#evaluate Worker.evaluate()} returns a <a
   * href='https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise'>Promise</a>, then {@link
-   * com.microsoft.playwright.Worker#evaluate Worker.evaluate()} would wait for the promise to resolve and return its value.
+   * Worker#evaluate Worker.evaluate()} would wait for the promise to resolve and return its value.
   *
-   * <p> If the function passed to the {@link com.microsoft.playwright.Worker#evaluate Worker.evaluate()} returns a
-   * non-[Serializable] value, then {@link com.microsoft.playwright.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}.
+   * <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}.
   *
-   * @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);
  /**
   * Returns the return value of {@code expression} as a {@code JSHandle}.
   *
-   * <p> The only difference between {@link com.microsoft.playwright.Worker#evaluate Worker.evaluate()} and {@link
-   * com.microsoft.playwright.Worker#evaluateHandle Worker.evaluateHandle()} is that {@link
-   * com.microsoft.playwright.Worker#evaluateHandle Worker.evaluateHandle()} returns {@code JSHandle}.
+   * <p> The only difference between {@link Worker#evaluate Worker.evaluate()} and {@link Worker#evaluateHandle
+   * Worker.evaluateHandle()} is that {@link Worker#evaluateHandle Worker.evaluateHandle()} returns {@code JSHandle}.
   *
-   * <p> If the function passed to the {@link com.microsoft.playwright.Worker#evaluateHandle Worker.evaluateHandle()} returns a
-   * <a href='https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise'>Promise</a>, then
-   * {@link com.microsoft.playwright.Worker#evaluateHandle Worker.evaluateHandle()} would wait for the promise to resolve and
-   * return its value.
+   * <p> If the function passed to the {@link Worker#evaluateHandle Worker.evaluateHandle()} returns a <a
+   * 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);
@@ -121,32 +112,23 @@ public interface Worker {
  /**
   * Returns the return value of {@code expression} as a {@code JSHandle}.
   *
-   * <p> The only difference between {@link com.microsoft.playwright.Worker#evaluate Worker.evaluate()} and {@link
-   * com.microsoft.playwright.Worker#evaluateHandle Worker.evaluateHandle()} is that {@link
-   * com.microsoft.playwright.Worker#evaluateHandle Worker.evaluateHandle()} returns {@code JSHandle}.
+   * <p> The only difference between {@link Worker#evaluate Worker.evaluate()} and {@link Worker#evaluateHandle
+   * Worker.evaluateHandle()} is that {@link Worker#evaluateHandle Worker.evaluateHandle()} returns {@code JSHandle}.
   *
-   * <p> If the function passed to the {@link com.microsoft.playwright.Worker#evaluateHandle Worker.evaluateHandle()} returns a
-   * <a href='https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise'>Promise</a>, then
-   * {@link com.microsoft.playwright.Worker#evaluateHandle Worker.evaluateHandle()} would wait for the promise to resolve and
-   * return its value.
+   * <p> If the function passed to the {@link Worker#evaluateHandle Worker.evaluateHandle()} returns a <a
+   * 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);
@@ -155,7 +137,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);
 }
@@ -18,8 +18,9 @@ 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.
+ * 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;
@@ -42,19 +43,13 @@ public interface APIResponseAssertions {
   * <pre>{@code
   * assertThat(response).not().isOK();
   * }</pre>
-   *
-   * @since v1.20
   */
  APIResponseAssertions not();
  /**
-   * Ensures the response status code is within {@code 200..299} range.
-   *
-   * <p> <strong>Usage</strong>
+   * Ensures the response status code is within [200..299] range.
   * <pre>{@code
   * assertThat(response).isOK();
   * }</pre>
-   *
-   * @since v1.18
   */
  void isOK();
 }
@@ -19,8 +19,9 @@ 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.
+ * 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;
@@ -30,7 +31,7 @@ import java.util.regex.Pattern;
 *   @Test
 *   void navigatesToLoginPage() {
 *     ...
- *     page.getByText("Sign in").click();
+ *     page.click("#login");
 *     assertThat(page).hasURL(Pattern.compile(".*\/login"));
 *   }
 * }
@@ -39,12 +40,12 @@ import java.util.regex.Pattern;
 public interface PageAssertions {
  class HasTitleOptions {
    /**
-     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
+     * Time to retry the assertion for.
     */
    public Double timeout;

    /**
-     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
+     * Time to retry the assertion for.
     */
    public HasTitleOptions setTimeout(double timeout) {
      this.timeout = timeout;
@@ -53,25 +54,12 @@ public interface PageAssertions {
  }
  class HasURLOptions {
    /**
-     * Whether to perform case-insensitive match. {@code ignoreCase} option takes precedence over the corresponding regular
-     * expression flag if specified.
-     */
-    public Boolean ignoreCase;
-    /**
-     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
+     * Time to retry the assertion for.
     */
    public Double timeout;

    /**
-     * Whether to perform case-insensitive match. {@code ignoreCase} option takes precedence over the corresponding regular
-     * expression flag if specified.
-     */
-    public HasURLOptions setIgnoreCase(boolean ignoreCase) {
-      this.ignoreCase = ignoreCase;
-      return this;
-    }
-    /**
-     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
+     * Time to retry the assertion for.
     */
    public HasURLOptions setTimeout(double timeout) {
      this.timeout = timeout;
@@ -84,112 +72,86 @@ public interface PageAssertions {
   * <pre>{@code
   * assertThat(page).not().hasURL("error");
   * }</pre>
-   *
-   * @since v1.20
   */
  PageAssertions not();
  /**
   * Ensures the page has the given title.
-   *
-   * <p> <strong>Usage</strong>
   * <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> <strong>Usage</strong>
   * <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> <strong>Usage</strong>
   * <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> <strong>Usage</strong>
   * <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> <strong>Usage</strong>
   * <pre>{@code
   * assertThat(page).hasURL(".com");
   * }</pre>
   *
-   * @param urlOrRegExp Expected URL string or RegExp.
-   * @since v1.20
+   * @param urlOrRegExp Expected substring or RegExp.
   */
  default void hasURL(String urlOrRegExp) {
    hasURL(urlOrRegExp, null);
  }
  /**
   * Ensures the page is navigated to the given URL.
-   *
-   * <p> <strong>Usage</strong>
   * <pre>{@code
   * assertThat(page).hasURL(".com");
   * }</pre>
   *
-   * @param urlOrRegExp Expected URL string or RegExp.
-   * @since v1.20
+   * @param urlOrRegExp Expected substring or RegExp.
   */
  void hasURL(String urlOrRegExp, HasURLOptions options);
  /**
   * Ensures the page is navigated to the given URL.
-   *
-   * <p> <strong>Usage</strong>
   * <pre>{@code
   * assertThat(page).hasURL(".com");
   * }</pre>
   *
-   * @param urlOrRegExp Expected URL string or RegExp.
-   * @since v1.20
+   * @param urlOrRegExp Expected substring or RegExp.
   */
  default void hasURL(Pattern urlOrRegExp) {
    hasURL(urlOrRegExp, null);
  }
  /**
   * Ensures the page is navigated to the given URL.
-   *
-   * <p> <strong>Usage</strong>
   * <pre>{@code
   * assertThat(page).hasURL(".com");
   * }</pre>
   *
-   * @param urlOrRegExp Expected URL string or RegExp.
-   * @since v1.20
+   * @param urlOrRegExp Expected substring or RegExp.
   */
  void hasURL(Pattern urlOrRegExp, HasURLOptions options);
 }
@@ -20,7 +20,6 @@ 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;

@@ -38,29 +37,26 @@ import com.microsoft.playwright.impl.PageAssertionsImpl;
 *   @Test
 *   void statusBecomesSubmitted() {
 *     ...
- *     page.locator("#submit-button").click();
+ *     page.click("#submit-button");
 *     assertThat(page.locator(".status")).hasText("Submitted");
 *   }
 * }
 * }</pre>
 *
- * <p> Playwright will be re-testing the node with the selector {@code .status} until fetched Node has the {@code "Submitted"}
- * text. It will be re-fetching the node and checking it over and over, until the condition is met or until the timeout is
- * reached. You can pass this timeout as an option.
+ * <p> Playwright will be re-testing the node with the selector {@code .status} until fetched Node has the {@code "Submitted"} text. It
+ * will be re-fetching the node and checking it over and over, until the condition is met or until the timeout is reached.
+ * You can pass this timeout as an option.
 *
 * <p> By default, the timeout for assertions is set to 5 seconds.
 */
 public interface PlaywrightAssertions {
  /**
   * Creates a {@code APIResponseAssertions} object for the given {@code APIResponse}.
-   *
-   * <p> <strong>Usage</strong>
   * <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);
@@ -68,14 +64,11 @@ public interface PlaywrightAssertions {

  /**
   * Creates a {@code LocatorAssertions} object for the given {@code Locator}.
-   *
-   * <p> <strong>Usage</strong>
   * <pre>{@code
   * PlaywrightAssertions.assertThat(locator).isVisible();
   * }</pre>
   *
   * @param locator {@code Locator} object to use for assertions.
-   * @since v1.18
   */
  static LocatorAssertions assertThat(Locator locator) {
    return new LocatorAssertionsImpl(locator);
@@ -83,33 +76,15 @@ public interface PlaywrightAssertions {

  /**
   * Creates a {@code PageAssertions} object for the given {@code Page}.
-   *
-   * <p> <strong>Usage</strong>
   * <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> <strong>Usage</strong>
-   * <pre>{@code
-   * PlaywrightAssertions.setDefaultAssertionTimeout(30_000);
-   * }</pre>
-   *
-   * @param timeout Timeout in milliseconds.
-   * @since v1.25
-   */
-  static void setDefaultAssertionTimeout(double timeout) {
-    AssertionsTimeout.setDefaultTimeout(timeout);
-  }
-
 }

@@ -1,22 +1,8 @@
-/*
- * 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.*;
+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;
@@ -29,7 +15,6 @@ import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.util.Base64;
 import java.util.LinkedHashMap;
-import java.util.List;
 import java.util.Map;

 import static com.microsoft.playwright.impl.Serialization.*;
@@ -37,7 +22,6 @@ import static com.microsoft.playwright.impl.Utils.toFilePayload;

 class APIRequestContextImpl extends ChannelOwner implements APIRequestContext {
  private final TracingImpl tracing;
-  private String disposeReason;

  APIRequestContextImpl(ChannelOwner parent, String type, String guid, JsonObject initializer) {
    super(parent, type, guid, initializer);
@@ -50,17 +34,8 @@ class APIRequestContextImpl extends ChannelOwner implements APIRequestContext {
  }

  @Override
-  public void dispose(DisposeOptions options) {
-    withLogging("APIRequestContext.dispose", () -> disposeImpl(options));
-  }
-
-  private void disposeImpl(DisposeOptions options) {
-    if (options == null) {
-      options = new DisposeOptions();
-    }
-    disposeReason = options.reason;
-    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
-    sendMessage("dispose", params);
+  public void dispose() {
+    withLogging("APIRequestContext.dispose", () -> sendMessage("dispose"));
  }

  @Override
@@ -87,9 +62,6 @@ class APIRequestContextImpl extends ChannelOwner implements APIRequestContext {
  }

  private APIResponse fetchImpl(String url, RequestOptionsImpl options) {
-    if (disposeReason != null) {
-      throw new PlaywrightException(disposeReason);
-    }
    if (options == null) {
      options = new RequestOptionsImpl();
    }
@@ -100,7 +72,7 @@ class APIRequestContextImpl extends ChannelOwner implements APIRequestContext {
      for (Map.Entry<String, ?> e : options.params.entrySet()) {
        queryParams.put(e.getKey(), "" + e.getValue());
      }
-      params.add("params", toNameValueArray(queryParams.entrySet()));
+      params.add("params", toNameValueArray(queryParams));
    }
    if (options.method != null) {
      params.addProperty("method", options.method);
@@ -113,14 +85,11 @@ class APIRequestContextImpl extends ChannelOwner implements APIRequestContext {
      byte[] bytes = null;
      if (options.data instanceof byte[]) {
        bytes = (byte[]) options.data;
-      } else if (options.data instanceof String) {
-        String stringData = (String) options.data;
-        if (!isJsonContentType(options.headers) || isJsonParsable(stringData)) {
-          bytes = (stringData).getBytes(StandardCharsets.UTF_8);
-        }
+      } else if (options.data instanceof String && !isJsonContentType(options.headers)) {
+        bytes = ((String) options.data).getBytes(StandardCharsets.UTF_8);
      }
      if (bytes == null) {
-        params.addProperty("jsonData", jsonDataSerializer.toJson(options.data));
+        params.add("jsonData", gson().toJsonTree(options.data));
      } else {
        String base64 = Base64.getEncoder().encodeToString(bytes);
        params.addProperty("postData", base64);
@@ -141,12 +110,6 @@ class APIRequestContextImpl extends ChannelOwner implements APIRequestContext {
    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"));
  }
@@ -163,9 +126,9 @@ class APIRequestContextImpl extends ChannelOwner implements APIRequestContext {
    return false;
  }

-  private static JsonArray serializeMultipartData(List<? extends Map.Entry<String, Object>> data) {
+  private static JsonArray serializeMultipartData(Map<String, Object> data) {
    JsonArray result = new JsonArray();
-    for (Map.Entry<String, ?> e : data) {
+    for (Map.Entry<String, Object> e : data.entrySet()) {
      FilePayload filePayload = null;
      if (e.getValue() instanceof FilePayload) {
        filePayload = (FilePayload) e.getValue();
@@ -224,7 +187,7 @@ class APIRequestContextImpl extends ChannelOwner implements APIRequestContext {
  }

  private static RequestOptionsImpl ensureOptions(RequestOptions options, String method) {
-    RequestOptionsImpl impl = Utils.clone((RequestOptionsImpl) options);
+    RequestOptionsImpl impl = (RequestOptionsImpl) options;
    if (impl == null) {
      impl = new RequestOptionsImpl();
    }
@@ -233,21 +196,4 @@ class APIRequestContextImpl extends ChannelOwner implements APIRequestContext {
    }
    return impl;
  }
-
-  private static boolean isJsonParsable(String value) {
-    try {
-      JsonElement result = JsonParser.parseString(value);
-      if (result != null && result.isJsonPrimitive()) {
-        JsonPrimitive primitive = result.getAsJsonPrimitive();
-        if (primitive.isString() && value.equals(primitive.getAsString())) {
-          // Gson parses unquoted strings too, but we don't want to treat them
-          // as valid JSON.
-          return false;
-        }
-      }
-      return true;
-    } catch (JsonSyntaxException error) {
-      return false;
-    }
-  }
 }
@@ -1,19 +1,3 @@
-/*
- * 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.Gson;
@@ -21,7 +21,6 @@ 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;
@@ -55,20 +54,6 @@ public class APIResponseAssertionsImpl implements APIResponseAssertions {
    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);
+    throw new AssertionFailedError(message + log);
  }
 }
@@ -19,8 +19,6 @@ package com.microsoft.playwright.impl;
 import com.google.gson.JsonObject;
 import com.microsoft.playwright.PlaywrightException;

-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.FileSystems;
 import java.nio.file.Path;
@@ -28,30 +26,20 @@ 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);
  }

  public InputStream createReadStream() {
    JsonObject result = sendMessage("stream").getAsJsonObject();
+    if (!result.has("stream")) {
+      return null;
+    }
    Stream stream = connection.getExistingObject(result.getAsJsonObject("stream").get("guid").getAsString());
    return stream.stream();
  }

-  byte[] readAllBytes() {
-    final int bufLen = 1024 * 1024;
-    byte[] buf = new byte[bufLen];
-    int readLen;
-    try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); InputStream stream = createReadStream()) {
-      while ((readLen = stream.read(buf, 0, bufLen)) != -1) {
-        outputStream.write(buf, 0, readLen);
-      }
-      return outputStream.toByteArray();
-    } catch (IOException e) {
-      throw new PlaywrightException("Failed to read artifact",  e);
-    }
-  }
-
  public void cancel() {
    sendMessage("cancel");
  }
@@ -69,7 +57,7 @@ class ArtifactImpl extends ChannelOwner {
  }

  public Path pathAfterFinished() {
-    if (connection.isRemote) {
+    if (isRemote) {
      throw new PlaywrightException("Path is not available when using browserType.connect(). Use download.saveAs() to save a local copy.");
    }
    JsonObject json = sendMessage("pathAfterFinished").getAsJsonObject();
@@ -77,7 +65,7 @@ class ArtifactImpl extends ChannelOwner {
  }

  public void saveAs(Path path) {
-    if (connection.isRemote) {
+    if (isRemote) {
      JsonObject jsonObject = sendMessage("saveAsStream").getAsJsonObject();
      Stream stream = connection.getExistingObject(jsonObject.getAsJsonObject("stream").get("guid").getAsString());
      writeToFile(stream.stream(), path);
@@ -20,7 +20,6 @@ import com.microsoft.playwright.PlaywrightException;
 import org.opentest4j.AssertionFailedError;
 import org.opentest4j.ValueWrapper;

-import java.lang.reflect.Field;
 import java.util.Collection;
 import java.util.List;
 import java.util.regex.Pattern;
@@ -53,7 +52,7 @@ class AssertionsBase {

  void expectImpl(String expression, FrameExpectOptions expectOptions, Object expected, String message) {
    if (expectOptions.timeout == null) {
-      expectOptions.timeout = AssertionsTimeout.defaultTimeout;
+      expectOptions.timeout = 5_000.0;
    }
    if (expectOptions.isNot) {
      message = message.replace("expected to", "expected not to");
@@ -92,17 +91,4 @@ class AssertionsBase {
    }
    return expected;
  }
-
-  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,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;
-  }
-}
@@ -20,23 +20,23 @@ import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.microsoft.playwright.*;
-import com.microsoft.playwright.options.*;
+import com.microsoft.playwright.options.BindingCallback;
+import com.microsoft.playwright.options.Cookie;
+import com.microsoft.playwright.options.FunctionCallback;
+import com.microsoft.playwright.options.Geolocation;

 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.*;
-import java.util.function.BooleanSupplier;
 import java.util.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.*;
+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;
@@ -45,50 +45,20 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
  private final BrowserImpl browser;
  private final TracingImpl tracing;
  private final APIRequestContextImpl request;
-  private final ClockImpl clock;
  final List<PageImpl> pages = new ArrayList<>();
-  final List<PageImpl> backgroundPages = new ArrayList<>();
-
  final Router routes = new Router();
-  private boolean closeWasCalled;
-  private final WaitableEvent<EventType, ?> closePromise;
+  private boolean isClosedOrClosing;
  final Map<String, BindingCallback> bindings = new HashMap<>();
  PageImpl ownerPage;
-  private String closeReason;
-
-  private static final Map<EventType, String> eventSubscriptions() {
-    Map<EventType, String> result = new HashMap<>();
-    result.put(EventType.CONSOLE, "console");
-    result.put(EventType.DIALOG, "dialog");
-    result.put(EventType.REQUEST, "request");
-    result.put(EventType.RESPONSE, "response");
-    result.put(EventType.REQUESTFINISHED, "requestFinished");
-    result.put(EventType.REQUESTFAILED, "requestFailed");
-    return result;
-  }
-  private final ListenerCollection<EventType> listeners = new ListenerCollection<>(eventSubscriptions(), this);
+  private final ListenerCollection<EventType> listeners = new ListenerCollection<>();
  final TimeoutSettings timeoutSettings = new TimeoutSettings();
  Path videosDir;
  URL baseUrl;
-  final Map<String, HarRecorder> harRecorders = new HashMap<>();
-
-  static class HarRecorder {
-    final Path path;
-    final HarContentPolicy contentPolicy;
-
-    HarRecorder(Path har, HarContentPolicy policy) {
-      path = har;
-      contentPolicy = policy;
-    }
-  }
+  Path recordHarPath;

  enum EventType {
-    BACKGROUNDPAGE,
    CLOSE,
-    CONSOLE,
-    DIALOG,
    PAGE,
-    WEBERROR,
    REQUEST,
    REQUESTFAILED,
    REQUESTFINISHED,
@@ -102,16 +72,9 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
    } else {
      browser = null;
    }
-    tracing = connection.getExistingObject(initializer.getAsJsonObject("tracing").get("guid").getAsString());
-    request = connection.getExistingObject(initializer.getAsJsonObject("requestContext").get("guid").getAsString());
-    clock = new ClockImpl(this);
-    closePromise = new WaitableEvent<>(listeners, EventType.CLOSE);
-  }
-
-  void setRecordHar(Path path, HarContentPolicy policy) {
-    if (path != null) {
-      harRecorders.put("", new HarRecorder(path, policy));
-    }
+    this.tracing = connection.getExistingObject(initializer.getAsJsonObject("tracing").get("guid").getAsString());
+    tracing.isRemote = browser != null && browser.isRemote;
+    this.request = connection.getExistingObject(initializer.getAsJsonObject("APIRequestContext").get("guid").getAsString());
  }

  void setBaseUrl(String spec) {
@@ -122,26 +85,6 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
    }
  }

-  String effectiveCloseReason() {
-    if (closeReason != null) {
-      return closeReason;
-    }
-    if (browser != null) {
-      return browser.closeReason;
-    }
-    return null;
-  }
-
-  @Override
-  public void onBackgroundPage(Consumer<Page> handler) {
-    listeners.add(EventType.BACKGROUNDPAGE, handler);
-  }
-
-  @Override
-  public void offBackgroundPage(Consumer<Page> handler) {
-    listeners.remove(EventType.BACKGROUNDPAGE, handler);
-  }
-
  @Override
  public void onClose(Consumer<BrowserContext> handler) {
    listeners.add(EventType.CLOSE, handler);
@@ -152,26 +95,6 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
    listeners.remove(EventType.CLOSE, handler);
  }

-  @Override
-  public void onConsoleMessage(Consumer<ConsoleMessage> handler) {
-    listeners.add(EventType.CONSOLE, handler);
-  }
-
-  @Override
-  public void offConsoleMessage(Consumer<ConsoleMessage> handler) {
-    listeners.remove(EventType.CONSOLE, handler);
-  }
-
-  @Override
-  public void onDialog(Consumer<Dialog> handler) {
-    listeners.add(EventType.DIALOG, handler);
-  }
-
-  @Override
-  public void offDialog(Consumer<Dialog> handler) {
-    listeners.remove(EventType.DIALOG, handler);
-  }
-
  @Override
  public void onPage(Consumer<Page> handler) {
    listeners.add(EventType.PAGE, handler);
@@ -182,16 +105,6 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
    listeners.remove(EventType.PAGE, handler);
  }

-  @Override
-  public void onWebError(Consumer<WebError> handler) {
-    listeners.add(EventType.WEBERROR, handler);
-  }
-
-  @Override
-  public void offWebError(Consumer<WebError> handler) {
-    listeners.remove(EventType.WEBERROR, handler);
-  }
-
  @Override
  public void onRequest(Consumer<Request> handler) {
    listeners.add(EventType.REQUEST, handler);
@@ -232,11 +145,6 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
    listeners.remove(EventType.RESPONSE, handler);
  }

-  @Override
-  public ClockImpl clock() {
-    return clock;
-  }
-
  private <T> T waitForEventWithTimeout(EventType eventType, Runnable code, Predicate<T> predicate, Double timeout) {
    List<Waitable<T>> waitables = new ArrayList<>();
    waitables.add(new WaitableEvent<>(listeners, eventType, predicate));
@@ -247,7 +155,7 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {

  @Override
  public Page waitForPage(WaitForPageOptions options, Runnable code) {
-    return withWaitLogging("BrowserContext.close", logger -> waitForPageImpl(options, code));
+    return withWaitLogging("BrowserContext.close", () -> waitForPageImpl(options, code));
  }

  private Page waitForPageImpl(WaitForPageOptions options, Runnable code) {
@@ -258,24 +166,8 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
  }

  @Override
-  public CDPSession newCDPSession(Page page) {
-    JsonObject params = new JsonObject();
-    params.add("page", ((PageImpl) page).toProtocolRef());
-    JsonObject result = sendMessage("newCDPSession", params).getAsJsonObject();
-    return connection.getExistingObject(result.getAsJsonObject("session").get("guid").getAsString());
-  }
-
-  @Override
-  public CDPSession newCDPSession(Frame frame) {
-    JsonObject params = new JsonObject();
-    params.add("frame", ((FrameImpl) frame).toProtocolRef());
-    JsonObject result = sendMessage("newCDPSession", params).getAsJsonObject();
-    return connection.getExistingObject(result.getAsJsonObject("session").get("guid").getAsString());
-  }
-
-  @Override
-  public void close(CloseOptions options) {
-    withLogging("BrowserContext.close", () -> closeImpl(options));
+  public void close() {
+    withLogging("BrowserContext.close", () -> closeImpl());
  }

  @Override
@@ -283,39 +175,30 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
    return cookies(url == null ? new ArrayList<>() : Collections.singletonList(url));
  }

-  private void closeImpl(CloseOptions options) {
-    if (!closeWasCalled) {
-      closeWasCalled = true;
-      if (options == null) {
-        options = new CloseOptions();
-      }
-      closeReason = options.reason;
-      request.dispose(convertType(options, APIRequestContext.DisposeOptions.class));
-      for (Map.Entry<String, HarRecorder> entry : harRecorders.entrySet()) {
-        JsonObject params = new JsonObject();
-        params.addProperty("harId", entry.getKey());
-        JsonObject json = sendMessage("harExport", params).getAsJsonObject();
+  private void closeImpl() {
+    if (isClosedOrClosing) {
+      return;
+    }
+    isClosedOrClosing = true;
+    try {
+      if (recordHarPath != null)  {
+        JsonObject json = sendMessage("harExport").getAsJsonObject();
        ArtifactImpl artifact = connection.getExistingObject(json.getAsJsonObject("artifact").get("guid").getAsString());
-        // Server side will compress artifact if content is attach or if file is .zip.
-        HarRecorder harParams = entry.getValue();
-        boolean isCompressed = harParams.contentPolicy == HarContentPolicy.ATTACH || harParams.path.toString().endsWith(".zip");
-        boolean needCompressed = harParams.path.toString().endsWith(".zip");
-        if (isCompressed && !needCompressed) {
-          String tmpPath = harParams.path + ".tmp";
-          artifact.saveAs(Paths.get(tmpPath));
-          JsonObject unzipParams = new JsonObject();
-          unzipParams.addProperty("zipFile", tmpPath);
-          unzipParams.addProperty("harFile", harParams.path.toString());
-          connection.localUtils.sendMessage("harUnzip", unzipParams);
-        } else {
-          artifact.saveAs(harParams.path);
+        // In case of CDP connection browser is null but since the connection is established by
+        // the driver it is safe to consider the artifact local.
+        if (browser() != null && browser().isRemote) {
+          artifact.isRemote = true;
        }
+        artifact.saveAs(recordHarPath);
        artifact.delete();
      }
-      JsonObject params = gson().toJsonTree(options).getAsJsonObject();
-      sendMessage("close", params);
+
+      sendMessage("close");
+    } catch (PlaywrightException e) {
+      if (!isSafeCloseError(e)) {
+        throw e;
+      }
    }
-    runUntil(() -> {}, closePromise);
  }

  @Override
@@ -344,11 +227,6 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
    });
  }

-  @Override
-  public List<Page> backgroundPages() {
-    return new ArrayList<>(backgroundPages);
-  }
-
  private void addInitScriptImpl(String script) {
    JsonObject params = new JsonObject();
    params.addProperty("source", script);
@@ -361,29 +239,8 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
  }

  @Override
-  public void clearCookies(ClearCookiesOptions options) {
-    withLogging("BrowserContext.clearCookies", () -> clearCookiesImpl(options));
-  }
-
-  private void clearCookiesImpl(ClearCookiesOptions options) {
-    if (options == null) {
-      options = new ClearCookiesOptions();
-    }
-    JsonObject params = new JsonObject();
-    setStringOrRegex(params, "name", options.name);
-    setStringOrRegex(params, "domain", options.domain);
-    setStringOrRegex(params, "path", options.path);
-    sendMessage("clearCookies", params);
-  }
-
-  private static void setStringOrRegex(JsonObject params, String name, Object value) {
-    if (value instanceof String) {
-      params.addProperty(name, (String) value);
-    } else if (value instanceof Pattern) {
-      Pattern pattern = (Pattern) value;
-      params.addProperty(name + "RegexSource", pattern.pattern());
-      params.addProperty(name + "RegexFlags", toJsRegexFlags(pattern));
-    }
+  public void clearCookies() {
+    withLogging("BrowserContext.clearCookies", () -> sendMessage("clearCookies"));
  }

  @Override
@@ -479,7 +336,7 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {

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

  @Override
@@ -492,54 +349,19 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
    route(new UrlMatcher(url), handler, options);
  }

-  @Override
-  public void routeFromHAR(Path har, RouteFromHAROptions options) {
-    if (options == null) {
-      options = new RouteFromHAROptions();
-    }
-    if (options.update != null && options.update) {
-      recordIntoHar(null, har, options);
-      return;
-    }
-    UrlMatcher matcher = UrlMatcher.forOneOf(baseUrl, options.url);
-    HARRouter harRouter = new HARRouter(connection.localUtils, har, options.notFound);
-    onClose(context -> harRouter.dispose());
-    route(matcher, route -> harRouter.handle(route), null);
-  }
-
  private void route(UrlMatcher matcher, Consumer<Route> handler, RouteOptions options) {
    withLogging("BrowserContext.route", () -> {
      routes.add(matcher, handler, options == null ? null : options.times);
-      updateInterceptionPatterns();
+      if (routes.size() == 1) {
+        JsonObject params = new JsonObject();
+        params.addProperty("enabled", true);
+        sendMessage("setNetworkInterceptionEnabled", params);
+      }
    });
  }

-  void recordIntoHar(PageImpl page, Path har, RouteFromHAROptions options) {
-    JsonObject params = new JsonObject();
-    if (page != null) {
-      params.add("page", page.toProtocolRef());
-    }
-    JsonObject jsonOptions = new JsonObject();
-    jsonOptions.addProperty("path", har.toAbsolutePath().toString());
-    jsonOptions.addProperty("content", options.updateContent == null ?
-      HarContentPolicy.ATTACH.name().toLowerCase() :
-      options.updateContent.name().toLowerCase());
-    jsonOptions.addProperty("mode", options.updateMode == null ?
-      HarMode.MINIMAL.name().toLowerCase() :
-      options.updateMode.name().toLowerCase());
-    addHarUrlFilter(jsonOptions, options.url);
-    params.add("options", jsonOptions);
-    JsonObject json = sendMessage("harStart", params).getAsJsonObject();
-    String harId = json.get("harId").getAsString();
-    harRecorders.put(harId, new HarRecorder(har, HarContentPolicy.ATTACH));
-  }
-
  @Override
  public void setDefaultNavigationTimeout(double timeout) {
-    setDefaultNavigationTimeoutImpl(timeout);
-  }
-
-  void setDefaultNavigationTimeoutImpl(Double timeout) {
    withLogging("BrowserContext.setDefaultNavigationTimeout", () -> {
      timeoutSettings.setDefaultNavigationTimeout(timeout);
      JsonObject params = new JsonObject();
@@ -550,10 +372,6 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {

  @Override
  public void setDefaultTimeout(double timeout) {
-    setDefaultTimeoutImpl(timeout);
-  }
-
-  void setDefaultTimeoutImpl(Double timeout) {
    withLogging("BrowserContext.setDefaultTimeout", () -> {
      timeoutSettings.setDefaultTimeout(timeout);
      JsonObject params = new JsonObject();
@@ -615,14 +433,6 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
    return tracing;
  }

-  @Override
-  public void unrouteAll() {
-    withLogging("BrowserContext.unrouteAll", () -> {
-      routes.removeAll();
-      updateInterceptionPatterns();
-    });
-  }
-
  @Override
  public void unroute(String url, Consumer<Route> handler) {
    unroute(new UrlMatcher(this.baseUrl, url), handler);
@@ -638,27 +448,6 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
    unroute(new UrlMatcher(url), handler);
  }

-  @Override
-  public void waitForCondition(BooleanSupplier predicate, WaitForConditionOptions options) {
-    List<Waitable<Void>> waitables = new ArrayList<>();
-    waitables.add(new WaitableContextClose<>());
-    waitables.add(timeoutSettings.createWaitable(options == null ? null : options.timeout));
-    waitables.add(new WaitablePredicate<>(predicate));
-    runUntil(() -> {}, new WaitableRace<>(waitables));
-  }
-
-  @Override
-  public ConsoleMessage waitForConsoleMessage(WaitForConsoleMessageOptions options, Runnable code) {
-    return withWaitLogging("BrowserContext.waitForConsoleMessage", logger -> waitForConsoleMessageImpl(options, code));
-  }
-
-  private ConsoleMessage waitForConsoleMessageImpl(WaitForConsoleMessageOptions options, Runnable code) {
-    if (options == null) {
-      options = new WaitForConsoleMessageOptions();
-    }
-    return waitForEventWithTimeout(EventType.CONSOLE, code, options.predicate, options.timeout);
-  }
-
  private class WaitableContextClose<R> extends WaitableEvent<EventType, R> {
    WaitableContextClose() {
      super(BrowserContextImpl.this.listeners, EventType.CLOSE);
@@ -666,69 +455,42 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {

    @Override
    public R get() {
-      throw new TargetClosedError(effectiveCloseReason());
+      throw new PlaywrightException("Context closed");
    }
  }

  private void unroute(UrlMatcher matcher, Consumer<Route> handler) {
    withLogging("BrowserContext.unroute", () -> {
      routes.remove(matcher, handler);
-      updateInterceptionPatterns();
+      maybeDisableNetworkInterception();
    });
  }

-  private void updateInterceptionPatterns() {
-    sendMessage("setNetworkInterceptionPatterns", routes.interceptionPatterns());
-  }
-
-  void handleRoute(RouteImpl route) {
-    Router.HandleResult handled = routes.handle(route);
-    if (handled != Router.HandleResult.NoMatchingHandler) {
-      updateInterceptionPatterns();
-    }
-    if (handled == Router.HandleResult.NoMatchingHandler || handled == Router.HandleResult.Fallback) {
-      route.resume(null, true);
+  private void maybeDisableNetworkInterception() {
+    if (routes.size() == 0) {
+      JsonObject params = new JsonObject();
+      params.addProperty("enabled", false);
+      sendMessage("setNetworkInterceptionEnabled", params);
    }
  }

-  WaitableResult<JsonElement> pause() {
-    return sendMessageAsync("pause", new JsonObject());
+  void handleRoute(Route route) {
+    boolean handled = routes.handle(route);
+    if (handled) {
+      maybeDisableNetworkInterception();
+    } else {
+      route.resume();
+    }
+  }
+
+  void pause() {
+    sendMessage("pause");
  }

  @Override
  protected void handleEvent(String event, JsonObject params) {
-    if ("dialog".equals(event)) {
-      String guid = params.getAsJsonObject("dialog").get("guid").getAsString();
-      DialogImpl dialog = connection.getExistingObject(guid);
-      boolean hasListeners = false;
-      if (listeners.hasListeners(EventType.DIALOG)) {
-        hasListeners = true;
-        listeners.notify(EventType.DIALOG, dialog);
-      }
-      PageImpl page = dialog.page();
-      if (page != null) {
-        if (page.listeners.hasListeners(PageImpl.EventType.DIALOG)) {
-          hasListeners = true;
-          page.listeners.notify(PageImpl.EventType.DIALOG, dialog);
-        }
-      }
-      // Although we do similar handling on the server side, we still need this logic
-      // on the client side due to a possible race condition between two async calls:
-      // a) removing "dialog" listener subscription (client->server)
-      // b) actual "dialog" event (server->client)
-      if (!hasListeners) {
-        if ("beforeunload".equals(dialog.type())) {
-          try {
-            dialog.accept();
-          } catch (PlaywrightException e) {
-          }
-        } else {
-          dialog.dismiss();
-        }
-      }
-    } else if ("route".equals(event)) {
-      RouteImpl route = connection.getExistingObject(params.getAsJsonObject("route").get("guid").getAsString());
-      route.browserContext = this;
+    if ("route".equals(event)) {
+      Route route = connection.getExistingObject(params.getAsJsonObject("route").get("guid").getAsString());
      handleRoute(route);
    } else if ("page".equals(event)) {
      PageImpl page = connection.getExistingObject(params.getAsJsonObject("page").get("guid").getAsString());
@@ -737,23 +499,12 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
      if (page.opener() != null && !page.opener().isClosed()) {
        page.opener().notifyPopup(page);
      }
-    } else if ("backgroundPage".equals(event)) {
-      PageImpl page = connection.getExistingObject(params.getAsJsonObject("page").get("guid").getAsString());
-      backgroundPages.add(page);
-      listeners.notify(EventType.BACKGROUNDPAGE, page);
    } else if ("bindingCall".equals(event)) {
      BindingCall bindingCall = connection.getExistingObject(params.getAsJsonObject("binding").get("guid").getAsString());
      BindingCallback binding = bindings.get(bindingCall.name());
      if (binding != null) {
        bindingCall.call(binding);
      }
-    } else if ("console".equals(event)) {
-      ConsoleMessageImpl message = new ConsoleMessageImpl(connection, params);
-      listeners.notify(BrowserContextImpl.EventType.CONSOLE, message);
-      PageImpl page = message.page();
-      if (page != null) {
-        page.listeners.notify(PageImpl.EventType.CONSOLE, message);
-      }
    } else if ("request".equals(event)) {
      String guid = params.getAsJsonObject("request").get("guid").getAsString();
      RequestImpl request = connection.getExistingObject(guid);
@@ -797,41 +548,22 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
        PageImpl page = connection.getExistingObject(params.getAsJsonObject("page").get("guid").getAsString());
        page.listeners.notify(PageImpl.EventType.RESPONSE, response);
      }
-    } else if ("pageError".equals(event)) {
-      SerializedError error = gson().fromJson(params.getAsJsonObject("error"), SerializedError.class);
-      String errorStr = "";
-      if (error.error != null) {
-        errorStr = error.error.name + ": " + error.error.message;
-        if (error.error.stack != null && !error.error.stack.isEmpty()) {
-          errorStr += "\n" + error.error.stack;
-        }
-      }
-      PageImpl page;
-      try {
-        page = connection.getExistingObject(params.getAsJsonObject("page").get("guid").getAsString());
-      } catch (PlaywrightException e) {
-        page = null;
-      }
-      listeners.notify(BrowserContextImpl.EventType.WEBERROR, new WebErrorImpl(page, errorStr));
-      if (page != null) {
-        page.listeners.notify(PageImpl.EventType.PAGEERROR, errorStr);
-      }
    } else if ("close".equals(event)) {
      didClose();
    }
  }

  void didClose() {
+    isClosedOrClosing = true;
    if (browser != null) {
      browser.contexts.remove(this);
    }
    listeners.notify(EventType.CLOSE, this);
  }

-  WritableStream createTempFile(String name, long lastModifiedMs) {
+  WritableStream createTempFile(String name) {
    JsonObject params = new JsonObject();
    params.addProperty("name", name);
-    params.addProperty("lastModifiedMs", lastModifiedMs);
    JsonObject json = sendMessage("createTempFile", params).getAsJsonObject();
    return connection.getExistingObject(json.getAsJsonObject("writableStream").get("guid").getAsString());
  }
@@ -19,30 +19,28 @@ 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 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.isSafeCloseError;

 class BrowserImpl extends ChannelOwner implements Browser {
  final Set<BrowserContextImpl> contexts = new HashSet<>();
  private final ListenerCollection<EventType> listeners = new ListenerCollection<>();
+  boolean isRemote;
  boolean isConnectedOverWebSocket;
  private boolean isConnected = true;
-  BrowserTypeImpl browserType;
-  BrowserType.LaunchOptions launchOptions;
-  private Path tracePath;
-  String closeReason;
+  LocalUtils localUtils;

  enum EventType {
    DISCONNECTED,
@@ -63,20 +61,11 @@ class BrowserImpl extends ChannelOwner implements Browser {
  }

  @Override
-  public BrowserType browserType() {
-    return browserType;
+  public void close() {
+    withLogging("Browser.close", () -> closeImpl());
  }

-  @Override
-  public void close(CloseOptions options) {
-    withLogging("Browser.close", () -> closeImpl(options));
-  }
-
-  private void closeImpl(CloseOptions options) {
-    if (options == null) {
-      options = new CloseOptions();
-    }
-    closeReason = options.reason;
+  private void closeImpl() {
    if (isConnectedOverWebSocket) {
      try {
        connection.close();
@@ -123,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 {
@@ -141,54 +127,25 @@ 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();
-      recordVideo.addProperty("dir", options.recordVideoDir.toAbsolutePath().toString());
+      recordVideo.addProperty("dir", options.recordVideoDir.toString());
      if (options.recordVideoSize != null) {
        recordVideo.add("size", gson().toJsonTree(options.recordVideoSize));
      }
@@ -208,20 +165,14 @@ class BrowserImpl extends ChannelOwner implements Browser {
        params.addProperty("noDefaultViewport", true);
      }
    }
-    params.remove("acceptDownloads");
-    if (options.acceptDownloads != null) {
-      params.addProperty("acceptDownloads", options.acceptDownloads ? "accept" : "deny");
-    }
    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);
    }
-    context.setRecordHar(recordHarPath, harContentPolicy);
-    if (launchOptions != null) {
-      context.tracing().setTracesDir(launchOptions.tracesDir);
-    }
+    context.recordHarPath = options.recordHarPath;
+    context.tracing().localUtils = localUtils;
    contexts.add(context);
    return context;
  }
@@ -240,10 +191,11 @@ class BrowserImpl extends ChannelOwner implements Browser {
    if (options == null) {
      options = new StartTracingOptions();
    }
-    tracePath = options.path;
    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);
  }
@@ -255,20 +207,7 @@ class BrowserImpl extends ChannelOwner implements Browser {

  private byte[] stopTracingImpl() {
    JsonObject json = sendMessage("stopTracing").getAsJsonObject();
-    ArtifactImpl artifact = connection.getExistingObject(json.getAsJsonObject().getAsJsonObject("artifact").get("guid").getAsString());
-    byte[] data = artifact.readAllBytes();
-    artifact.delete();
-    if (tracePath != null) {
-      try {
-        Files.createDirectories(tracePath.getParent());
-        Files.write(tracePath, data);
-      } catch (IOException e) {
-        throw new PlaywrightException("Failed to write trace file", e);
-      } finally {
-        tracePath = null;
-      }
-    }
-    return data;
+    return Base64.getDecoder().decode(json.get("binary").getAsString());
  }

  private Page newPageImpl(NewPageOptions options) {
@@ -299,13 +238,6 @@ class BrowserImpl extends ChannelOwner implements Browser {
    }
  }

-  @Override
-  public CDPSession newBrowserCDPSession() {
-    JsonObject params = new JsonObject();
-    JsonObject result = sendMessage("newBrowserCDPSession", params).getAsJsonObject();
-    return connection.getExistingObject(result.getAsJsonObject("session").get("guid").getAsString());
-  }
-
  private void didClose() {
    isConnected = false;
    listeners.notify(EventType.DISCONNECTED, this);
@@ -22,17 +22,16 @@ import com.google.gson.JsonObject;
 import com.microsoft.playwright.Browser;
 import com.microsoft.playwright.BrowserType;
 import com.microsoft.playwright.PlaywrightException;
-import com.microsoft.playwright.options.HarContentPolicy;

 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.function.Consumer;

-import static com.microsoft.playwright.impl.Serialization.addHarUrlFilter;
 import static com.microsoft.playwright.impl.Serialization.gson;
-import static com.microsoft.playwright.impl.Utils.convertType;

 class BrowserTypeImpl extends ChannelOwner implements BrowserType {
+  LocalUtils localUtils;
+
  BrowserTypeImpl(ChannelOwner parent, String type, String guid, JsonObject initializer) {
    super(parent, type, guid, initializer);
  }
@@ -49,8 +48,7 @@ class BrowserTypeImpl extends ChannelOwner implements BrowserType {
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
    JsonElement result = sendMessage("launch", params);
    BrowserImpl browser = connection.getExistingObject(result.getAsJsonObject().getAsJsonObject("browser").get("guid").getAsString());
-    browser.browserType = this;
-    browser.launchOptions = options;
+    browser.localUtils = localUtils;
    return browser;
  }

@@ -82,9 +80,9 @@ class BrowserTypeImpl extends ChannelOwner implements BrowserType {
      headers.addProperty("x-playwright-browser", name());
    }

-    JsonObject json = connection.localUtils().sendMessage("connect", params).getAsJsonObject();
+    JsonObject json = sendMessage("connect", params).getAsJsonObject();
    JsonPipe pipe = connection.getExistingObject(json.getAsJsonObject("pipe").get("guid").getAsString());
-    Connection connection = new Connection(pipe, this.connection.env, this.connection.localUtils);
+    Connection connection = new Connection(pipe);
    PlaywrightImpl playwright = connection.initializePlaywright();
    if (!playwright.initializer.has("preLaunchedBrowser")) {
      try {
@@ -96,8 +94,9 @@ class BrowserTypeImpl extends ChannelOwner implements BrowserType {
    }
    playwright.initSharedSelectors(this.connection.getExistingObject("Playwright"));
    BrowserImpl browser = connection.getExistingObject(playwright.initializer.getAsJsonObject("preLaunchedBrowser").get("guid").getAsString());
+    browser.isRemote = true;
    browser.isConnectedOverWebSocket = true;
-    browser.browserType = this;
+    browser.localUtils = localUtils;
    Consumer<JsonPipe> connectionCloseListener = t -> browser.notifyRemoteClosed();
    pipe.onClose(connectionCloseListener);
    browser.onDisconnected(b -> {
@@ -130,7 +129,8 @@ class BrowserTypeImpl extends ChannelOwner implements BrowserType {
    JsonObject json = sendMessage("connectOverCDP", params).getAsJsonObject();

    BrowserImpl browser = connection.getExistingObject(json.getAsJsonObject("browser").get("guid").getAsString());
-    browser.browserType = this;
+    browser.isRemote = true;
+    browser.localUtils = localUtils;
    if (json.has("defaultContext")) {
      String contextId = json.getAsJsonObject("defaultContext").get("guid").getAsString();
      BrowserContextImpl defaultContext = connection.getExistingObject(contextId);
@@ -152,56 +152,24 @@ 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();
-      recordVideo.addProperty("dir", options.recordVideoDir.toAbsolutePath().toString());
+      recordVideo.addProperty("dir", options.recordVideoDir.toString());
      if (options.recordVideoSize != null) {
        recordVideo.add("size", gson().toJsonTree(options.recordVideoSize));
      }
@@ -221,18 +189,14 @@ class BrowserTypeImpl extends ChannelOwner implements BrowserType {
        params.addProperty("noDefaultViewport", true);
      }
    }
-    params.remove("acceptDownloads");
-    if (options.acceptDownloads != null) {
-      params.addProperty("acceptDownloads", options.acceptDownloads ? "accept" : "deny");
-    }
    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);
    }
-    context.setRecordHar(recordHarPath, harContentPolicy);
-    context.tracing().setTracesDir(options.tracesDir);
+    context.recordHarPath = options.recordHarPath;
+    context.tracing().localUtils = localUtils;
    return context;
  }

@@ -1,75 +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.JsonElement;
-import com.google.gson.JsonObject;
-import com.microsoft.playwright.CDPSession;
-
-import java.util.HashMap;
-import java.util.function.Consumer;
-
-public class CDPSessionImpl extends ChannelOwner implements CDPSession {
-  private final ListenerCollection<String> listeners = new ListenerCollection<>(new HashMap<>(), this);
-
-  protected CDPSessionImpl(ChannelOwner parent, String type, String guid, JsonObject initializer) {
-    super(parent, type, guid, initializer);
-  }
-
-  @Override
-  void handleEvent(String event, JsonObject parameters) {
-    super.handleEvent(event, parameters);
-    if ("event".equals(event)) {
-      String method = parameters.get("method").getAsString();
-      JsonObject params = null;
-      if (parameters.has("params")) {
-        params = parameters.get("params").getAsJsonObject();
-      }
-      listeners.notify(method, params);
-    }
-  }
-
-  public JsonObject send(String method) {
-    return send(method, null);
-  }
-
-  public JsonObject send(String method, JsonObject params) {
-    JsonObject args = new JsonObject();
-    if (params != null) {
-      args.add("params", params);
-    }
-    args.addProperty("method", method);
-    JsonElement response = connection.sendMessage(guid, "send", args);
-    if (response == null) return null;
-    else return response.getAsJsonObject().get("result").getAsJsonObject();
-  }
-
-  @Override
-  public void on(String event, Consumer<JsonObject> handler) {
-    listeners.add(event, handler);
-  }
-
-  @Override
-  public void off(String event, Consumer<JsonObject> handler) {
-    listeners.remove(event, handler);
-  }
-
-  @Override
-  public void detach() {
-    sendMessage("detach");
-  }
-}
@@ -18,23 +18,20 @@ package com.microsoft.playwright.impl;

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

 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
-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;
  final String guid;
  final JsonObject initializer;
-  private boolean wasCollected;

  protected ChannelOwner(ChannelOwner parent, String type, String guid, JsonObject initializer) {
    this(parent.connection, parent, type, guid, initializer);
@@ -58,27 +55,20 @@ class ChannelOwner extends LoggingSupport {
    }
  }

-  void disposeChannelOwner(boolean wasGarbageCollected) {
+  void disconnect() {
    // Clean up from parent and connection.
    if (parent != null) {
      parent.objects.remove(guid);
    }
    connection.unregisterObject(guid);
-    wasCollected = wasGarbageCollected;
    // Dispose all children.
    for (ChannelOwner child : new ArrayList<>(objects.values())) {
-      child.disposeChannelOwner(wasGarbageCollected);
+      child.disconnect();
    }
    objects.clear();
  }

-  void adopt(ChannelOwner child) {
-    child.parent.objects.remove(child.guid);
-    objects.put(child.guid, child);
-    child.parent = this;
-  }
-
-  <T> T withWaitLogging(String apiName, Function<Logger, T> code) {
+  <T> T withWaitLogging(String apiName, Supplier<T> code) {
    return new WaitForEventLogger<>(this, apiName, code).get();
  }

@@ -93,7 +83,6 @@ class ChannelOwner extends LoggingSupport {
  }

  WaitableResult<JsonElement> sendMessageAsync(String method, JsonObject params) {
-    checkNotCollected();
    return connection.sendMessageAsync(guid, method, params);
  }

@@ -102,15 +91,9 @@ class ChannelOwner extends LoggingSupport {
  }

  JsonElement sendMessage(String method, JsonObject params) {
-    checkNotCollected();
    return connection.sendMessage(guid, method, params);
  }

-  private void checkNotCollected() {
-    if (wasCollected)
-      throw new PlaywrightException("The object has been collected to prevent unbounded heap growth.");
-  }
-
  <T> T runUntil(Runnable code, Waitable<T> waitable) {
    try {
      code.run();
@@ -125,10 +108,4 @@ class ChannelOwner extends LoggingSupport {

  void handleEvent(String event, JsonObject parameters) {
  }
-
-  JsonObject toProtocolRef() {
-    JsonObject json = new JsonObject();
-    json.addProperty("guid", guid);
-    return json;
-  }
 }
@@ -1,129 +0,0 @@
-package com.microsoft.playwright.impl;
-
-import com.google.gson.JsonObject;
-import com.microsoft.playwright.Clock;
-
-import java.util.Date;
-
-class ClockImpl implements Clock {
-  private final ChannelOwner browserContext;
-
-  ClockImpl(BrowserContextImpl browserContext) {
-    this.browserContext = browserContext;
-  }
-
-  @Override
-  public void fastForward(long ticks) {
-    JsonObject params = new JsonObject();
-    params.addProperty("ticksNumber", ticks);
-    browserContext.sendMessage("clockFastForward", params);
-  }
-
-  @Override
-  public void fastForward(String ticks) {
-    JsonObject params = new JsonObject();
-    params.addProperty("ticksString", ticks);
-    browserContext.sendMessage("clockFastForward", params);
-  }
-
-  @Override
-  public void install(InstallOptions options) {
-    JsonObject params = new JsonObject();
-    if (options != null) {
-      parseTime(options.time, params);
-    }
-    browserContext.sendMessage("clockInstall", params);
-  }
-
-  @Override
-  public void runFor(long ticks) {
-    JsonObject params = new JsonObject();
-    params.addProperty("ticksNumber", ticks);
-    browserContext.sendMessage("clockRunFor", params);
-  }
-
-  @Override
-  public void runFor(String ticks) {
-    JsonObject params = new JsonObject();
-    params.addProperty("ticksString", ticks);
-    browserContext.sendMessage("clockRunFor", params);
-  }
-
-  @Override
-  public void pauseAt(long time) {
-    JsonObject params = new JsonObject();
-    params.addProperty("timeNumber", time);
-    browserContext.sendMessage("clockPauseAt", params);
-  }
-
-  @Override
-  public void pauseAt(String time) {
-    JsonObject params = new JsonObject();
-    params.addProperty("timeString", time);
-    browserContext.sendMessage("clockPauseAt", params);
-  }
-
-  @Override
-  public void pauseAt(Date time) {
-    JsonObject params = new JsonObject();
-    params.addProperty("timeNumber", time.getTime());
-    browserContext.sendMessage("clockPauseAt", params);
-  }
-
-  @Override
-  public void resume() {
-    browserContext.sendMessage("clockResume");
-  }
-
-  @Override
-  public void setFixedTime(long time) {
-    JsonObject params = new JsonObject();
-    params.addProperty("timeNumber", time);
-    browserContext.sendMessage("clockSetFixedTime", params);
-  }
-
-  @Override
-  public void setFixedTime(String time) {
-    JsonObject params = new JsonObject();
-    params.addProperty("timeString", time);
-    browserContext.sendMessage("clockSetFixedTime", params);
-  }
-
-  @Override
-  public void setFixedTime(Date time) {
-    JsonObject params = new JsonObject();
-    params.addProperty("timeNumber", time.getTime());
-    browserContext.sendMessage("clockSetFixedTime", params);
-  }
-
-  @Override
-  public void setSystemTime(long time) {
-    JsonObject params = new JsonObject();
-    params.addProperty("timeNumber", time);
-    browserContext.sendMessage("clockSetSystemTime", params);
-  }
-
-  @Override
-  public void setSystemTime(String time) {
-    JsonObject params = new JsonObject();
-    params.addProperty("timeString", time);
-    browserContext.sendMessage("clockSetSystemTime", params);
-  }
-
-  @Override
-  public void setSystemTime(Date time) {
-    JsonObject params = new JsonObject();
-    params.addProperty("timeNumber", time.getTime());
-    browserContext.sendMessage("clockSetSystemTime", params);
-  }
-
-  private static void parseTime(Object time, JsonObject params) {
-    if (time instanceof Long) {
-      params.addProperty("timeNumber", (Long) time);
-    } else if (time instanceof Date) {
-      params.addProperty("timeNumber", ((Date) time).getTime());
-    } else if (time instanceof String) {
-      params.addProperty("timeString", (String) time);
-    }
-  }
-}
@@ -16,7 +16,6 @@
 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;
@@ -25,13 +24,10 @@ import com.microsoft.playwright.TimeoutError;

 import java.io.IOException;
 import java.time.Duration;
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;

 import static com.microsoft.playwright.impl.Serialization.gson;
-import static java.lang.System.currentTimeMillis;

 class Message {
  int id;
@@ -40,7 +36,6 @@ class Message {
  JsonObject params;
  JsonElement result;
  SerializedError error;
-  JsonArray log;

  @Override
  public String toString() {
@@ -60,7 +55,6 @@ 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 Map<Integer, WaitableResult<JsonElement>> callbacks = new HashMap<>();
@@ -70,17 +64,13 @@ public class Connection {
    String debug = System.getenv("DEBUG");
    isLogging = (debug != null) && debug.contains("pw:channel");
  }
-  LocalUtils localUtils;
-  PlaywrightImpl playwright;
-  final Map<String, String> env;
-  private int tracingCount;

  class Root extends ChannelOwner {
    Root(Connection connection) {
      super(connection, "Root", "");
    }

-    PlaywrightImpl initialize() {
+    Playwright initialize() {
      JsonObject params = new JsonObject();
      params.addProperty("sdkLanguage", "java");
      JsonElement result = sendMessage("initialize", params.getAsJsonObject());
@@ -88,32 +78,17 @@ public class Connection {
    }
  }

-  Connection(Transport pipe, Map<String, String> env, LocalUtils localUtils) {
-    this(pipe, env, true);
-    this.localUtils = localUtils;
-  }
-
-  Connection(Transport transport, Map<String, String> env) {
-    this(transport, env, false);
-  }
-
-  private Connection(Transport transport, Map<String, String> env, boolean isRemote) {
-    this.env = env;
-    this.isRemote = isRemote;
+  Connection(Transport transport) {
    if (isLogging) {
      transport = new TransportLogger(transport);
    }
    this.transport = transport;
    root = new Root(this);
-    stackTraceCollector = StackTraceCollector.createFromEnv(env);
+    stackTraceCollector = StackTraceCollector.createFromEnv();
  }

-  void setIsTracing(boolean tracing) {
-    if (tracing) {
-      ++tracingCount;
-    } else {
-      --tracingCount;
-    }
+  boolean isCollectingStacks() {
+    return stackTraceCollector != null;
  }

  String setApiName(String name) {
@@ -131,10 +106,10 @@ public class Connection {
  }

  public WaitableResult<JsonElement> sendMessageAsync(String guid, String method, JsonObject params) {
-    return internalSendMessage(guid, method, params, true);
+    return internalSendMessage(guid, method, params);
  }

-  private WaitableResult<JsonElement> internalSendMessage(String guid, String method, JsonObject params, boolean sendStack) {
+  private WaitableResult<JsonElement> internalSendMessage(String guid, String method, JsonObject params) {
    int id = ++lastId;
    WaitableResult<JsonElement> result = new WaitableResult<>();
    callbacks.put(id, result);
@@ -144,8 +119,6 @@ public class Connection {
    message.addProperty("method", method);
    message.add("params", params);
    JsonObject metadata = new JsonObject();
-    metadata.addProperty("wallTime", currentTimeMillis());
-    JsonArray stack = null;
    if (apiName == null) {
      metadata.addProperty("internal", true);
    } else {
@@ -153,37 +126,16 @@ public class Connection {
      // All but first message in an API call are considered internal and will be hidden from the inspector.
      apiName = null;
      if (stackTraceCollector != null) {
-        stack = stackTraceCollector.currentStackTrace();
-        if (!stack.isEmpty()) {
-          JsonObject location = new JsonObject();
-          JsonObject frame = stack.get(0).getAsJsonObject();
-          location.addProperty("file", frame.get("file").getAsString());
-          location.addProperty("line", frame.get("line").getAsInt());
-          location.addProperty("column", frame.get("column").getAsInt());
-          metadata.add("location", location);
-        }
+        metadata.add("stack", stackTraceCollector.currentStackTrace());
      }
    }
    message.add("metadata", metadata);
    transport.send(message);
-    if (sendStack && tracingCount > 0 && stack != null && !method.startsWith("LocalUtils")) {
-      JsonObject callData = new JsonObject();
-      callData.addProperty("id", id);
-      callData.add("stack", stack);
-      JsonObject stackParams = new JsonObject();
-      stackParams.add("callData", callData);
-      internalSendMessage(localUtils.guid,"addStackToTracingNoReply", stackParams, false);
-    }
    return result;
  }

  public PlaywrightImpl initializePlaywright() {
-    playwright = root.initialize();
-    return playwright;
-  }
-
-  LocalUtils localUtils() {
-    return localUtils;
+    return (PlaywrightImpl) this.root.initialize();
  }

  public <T> T getExistingObject(String guid) {
@@ -211,30 +163,6 @@ public class Connection {
    dispatch(messageObj);
  }

-  private static String formatCallLog(JsonArray log) {
-    if (log == null) {
-      return "";
-    }
-    boolean allEmpty = true;
-    for (JsonElement e: log) {
-      if (!e.getAsString().isEmpty()) {
-        allEmpty = false;
-        break;
-      }
-    }
-    if (allEmpty) {
-      return "";
-    }
-    List<String> lines = new ArrayList<>();
-    lines.add("");
-    lines.add("Call log:");
-    for (JsonElement e: log) {
-      lines.add("- " + e.getAsString());
-    }
-    lines.add("");
-    return String.join("\n", lines);
-  }
-
  private void dispatch(Message message) {
 //    System.out.println("Message: " + message.method + " " + message.id);
    if (message.id != 0) {
@@ -247,16 +175,12 @@ public class Connection {
      if (message.error == null) {
        callback.complete(message.result);
      } else {
-        String callLog = formatCallLog(message.log);
        if (message.error.error == null) {
-          callback.completeExceptionally(new PlaywrightException(message.error + callLog));
+          callback.completeExceptionally(new PlaywrightException(message.error.toString()));
        } else if ("TimeoutError".equals(message.error.error.name)) {
-          callback.completeExceptionally(new TimeoutError(message.error.error + callLog));
-        } else if ("TargetClosedError".equals(message.error.error.name)) {
-          callback.completeExceptionally(new TargetClosedError(message.error.error + callLog));
-
+          callback.completeExceptionally(new TimeoutError(message.error.error.toString()));
        } else {
-          callback.completeExceptionally(new DriverException(message.error.error + callLog));
+          callback.completeExceptionally(new DriverException(message.error.error));
        }
      }
      return;
@@ -270,25 +194,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__")) {
-      boolean wasCollected = message.params.has("reason") && "gc".equals(message.params.get("reason").getAsString());
-      object.disposeChannelOwner(wasCollected);
-      return;
-    }
    object.handleEvent(message.method, message.params);
  }

@@ -327,6 +244,9 @@ public class Connection {
      case "BrowserContext":
        result = new BrowserContextImpl(parent, type, guid, initializer);
        break;
+      case "ConsoleMessage":
+        result = new ConsoleMessageImpl(parent, type, guid, initializer);
+        break;
      case "Dialog":
        result = new DialogImpl(parent, type, guid, initializer);
        break;
@@ -351,9 +271,6 @@ public class Connection {
        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);
@@ -376,8 +293,6 @@ 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;
@@ -390,9 +305,6 @@ public class Connection {
      case "WritableStream":
        result = new WritableStream(parent, type, guid, initializer);
        break;
-      case "CDPSession":
-        result = new CDPSessionImpl(parent, type, guid, initializer);
-        break;
      default:
        throw new PlaywrightException("Unknown type " + type);
    }
@@ -20,27 +20,15 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.microsoft.playwright.ConsoleMessage;
 import com.microsoft.playwright.JSHandle;
-import com.microsoft.playwright.Page;

 import java.util.ArrayList;
 import java.util.List;

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

-public class ConsoleMessageImpl implements ConsoleMessage {
-  private final Connection connection;
-  private PageImpl page;
-  private final JsonObject initializer;
-
-  public ConsoleMessageImpl(Connection connection, JsonObject initializer) {
-    this.connection = connection;
-    // Note: currently, we only report console messages for pages and they always have a page.
-    // However, in the future we might report console messages for service workers or something else,
-    // where page() would be null.
-    if (initializer.has("page")) {
-      page = connection.getExistingObject(initializer.getAsJsonObject("page").get("guid").getAsString());
-    }
-    this.initializer = initializer;
+public class ConsoleMessageImpl extends ChannelOwner implements ConsoleMessage {
+  public ConsoleMessageImpl(ChannelOwner parent, String type, String guid, JsonObject initializer) {
+    super(parent, type, guid, initializer);
  }

  public String type() {
@@ -67,9 +55,4 @@ public class ConsoleMessageImpl implements ConsoleMessage {
      location.get("lineNumber").getAsNumber() + ":" +
      location.get("columnNumber").getAsNumber();
  }
-
-  @Override
-  public PageImpl page() {
-    return page;
-  }
 }
@@ -18,18 +18,10 @@ package com.microsoft.playwright.impl;

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

 class DialogImpl extends ChannelOwner implements Dialog {
-  private PageImpl page;
-
  DialogImpl(ChannelOwner parent, String type, String guid, JsonObject initializer) {
    super(parent, type, guid, initializer);
-    // Note: dialogs that open early during page initialization block it.
-    // Therefore, we must report the dialog without a page to be able to handle it.
-    if (initializer.has("page")) {
-      page = connection.getExistingObject(initializer.getAsJsonObject("page").get("guid").getAsString());
-    }
  }

  @Override
@@ -58,11 +50,6 @@ class DialogImpl extends ChannelOwner implements Dialog {
    return initializer.get("message").getAsString();
  }

-  @Override
-  public PageImpl page() {
-    return page;
-  }
-
  @Override
  public String type() {
    return initializer.get("type").getAsString();
@@ -22,7 +22,7 @@ import java.io.PrintStream;
 import java.io.PrintWriter;

 class DriverException extends PlaywrightException {
-  DriverException(String error) {
-    super(error);
+  DriverException(SerializedError.Error error) {
+    super(error.toString());
  }
 }
@@ -21,21 +21,20 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.microsoft.playwright.ElementHandle;
 import com.microsoft.playwright.Frame;
-import com.microsoft.playwright.PlaywrightException;
 import com.microsoft.playwright.options.BoundingBox;
 import com.microsoft.playwright.options.ElementState;
 import com.microsoft.playwright.options.FilePayload;
 import com.microsoft.playwright.options.SelectOption;

-import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
+import java.util.Arrays;
 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.addFilePathUploadParams;
+import static com.microsoft.playwright.impl.Utils.addLargeFileUploadParams;
 import static com.microsoft.playwright.options.ScreenshotType.JPEG;
 import static com.microsoft.playwright.options.ScreenshotType.PNG;

@@ -376,14 +375,11 @@ public class ElementHandleImpl extends JSHandleImpl implements ElementHandle {

  @Override
  public List<String> selectOption(String[] values, SelectOptionOptions options) {
-    if (options == null) {
-      options = new SelectOptionOptions();
+    if (values == null) {
+      return selectOption(new SelectOption[0], options);
    }
-    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
-    if (values != null) {
-      params.add("options", toSelectValueOrLabel(values));
-    }
-    return selectOption(params);
+    return selectOption(Arrays.asList(values).stream().map(
+      v -> new SelectOption().setValue(v)).toArray(SelectOption[]::new), options);
  }

  @Override
@@ -468,12 +464,16 @@ public class ElementHandleImpl extends JSHandleImpl implements ElementHandle {
    if (frame == null) {
      throw new Error("Cannot set input files to detached element");
    }
-    if (options == null) {
-      options = new SetInputFilesOptions();
+    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);
    }
-    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
-    addFilePathUploadParams(files, params, frame.page().context());
-    sendMessage("setInputFiles", params);
  }

  @Override
@@ -492,7 +492,7 @@ public class ElementHandleImpl extends JSHandleImpl implements ElementHandle {
      options = new SetInputFilesOptions();
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
-    params.add("payloads", Serialization.toJsonArray(files));
+    params.add("files", Serialization.toJsonArray(files));
    sendMessage("setInputFiles", params);
  }

@@ -20,93 +20,39 @@ import com.microsoft.playwright.options.FilePayload;
 import com.microsoft.playwright.options.FormData;

 import java.nio.file.Path;
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.LinkedHashMap;
+import java.util.Map;

 public class FormDataImpl implements FormData {
-  static class Field implements Map.Entry<String, Object> {
-    final String name;
-    final Object value;
-
-    private Field(String name, Object value) {
-        this.name = name;
-        this.value = value;
-    }
-
-    @Override
-    public String getKey() {
-      return name;
-    }
-
-    @Override
-    public Object getValue() {
-      return value;
-    }
-
-    @Override
-    public Object setValue(Object value) {
-      throw new UnsupportedOperationException();
-    }
-  }
-  List<Field> fields = new ArrayList();
-
-  @Override
-  public FormData append(String name, String value) {
-    return appendImpl(name, value);
-  }
-
-  @Override
-  public FormData append(String name, boolean value) {
-    return appendImpl(name, value);
-  }
-
-  @Override
-  public FormData append(String name, int value) {
-    return appendImpl(name, value);
-  }
-
-  @Override
-  public FormData append(String name, Path value) {
-    return appendImpl(name, value);
-  }
-
-  @Override
-  public FormData append(String name, FilePayload value) {
-    return appendImpl(name, value);
-  }
+  Map<String, Object> fields = new LinkedHashMap<>();

  @Override
  public FormData set(String name, String value) {
-    return setImpl(name, value);
+    fields.put(name, value);
+    return this;
  }

  @Override
  public FormData set(String name, boolean value) {
-    return setImpl(name, value);
+    fields.put(name, value);
+    return this;
  }

  @Override
  public FormData set(String name, int value) {
-    return setImpl(name, value);
+    fields.put(name, value);
+    return this;
  }

  @Override
  public FormData set(String name, Path value) {
-    return setImpl(name, value);
+    fields.put(name, value);
+    return this;
  }

  @Override
  public FormData set(String name, FilePayload value) {
-    return setImpl(name, value);
-  }
-
-  private FormData setImpl(String name, Object value) {
-    fields = fields.stream().filter(f -> !name.equals(f.name)).collect(Collectors.toList());
-    return appendImpl(name, value);
-  }
-
-  private FormData appendImpl(String name, Object value) {
-    fields.add(new Field(name, value));
+    fields.put(name, value);
    return this;
  }
 }
@@ -23,6 +23,7 @@ import com.microsoft.playwright.*;
 import com.microsoft.playwright.options.*;

 import java.io.IOException;
+import java.io.OutputStream;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -31,7 +32,6 @@ import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;

-import static com.microsoft.playwright.impl.LocatorUtils.*;
 import static com.microsoft.playwright.impl.Utils.*;
 import static com.microsoft.playwright.options.WaitUntilState.*;
 import static com.microsoft.playwright.impl.Serialization.*;
@@ -110,7 +110,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
@@ -186,7 +190,7 @@ public class FrameImpl extends ChannelOwner implements Frame {
        throw new PlaywrightException("Failed to read from file", e);
      }
      String content = new String(encoded, StandardCharsets.UTF_8);
-      content = addSourceUrlToScript(content, options.path);
+      content += "//# sourceURL=" + options.path.toString().replace("\n", "");
      jsonOptions.addProperty("content", content);
    }
    JsonElement json = sendMessage("addScriptTag", jsonOptions);
@@ -370,71 +374,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, connection.playwright));
-  }
-
-  @Override
-  public Locator getByTestId(Pattern testId) {
-    return locator(getByTestIdSelector(testId, connection.playwright));
-  }
-
-  @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();
@@ -689,18 +628,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));
@@ -761,13 +688,17 @@ public class FrameImpl extends ChannelOwner implements Frame {
  }

  void setInputFilesImpl(String selector, Path[] files, SetInputFilesOptions options) {
-    if (options == null) {
-      options = new SetInputFilesOptions();
+    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);
    }
-    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
-    addFilePathUploadParams(files, params, page.context());
-    params.addProperty("selector", selector);
-    sendMessage("setInputFiles", params);
  }

  @Override
@@ -787,7 +718,7 @@ public class FrameImpl extends ChannelOwner implements Frame {
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
    params.addProperty("selector", selector);
-    params.add("payloads", toJsonArray(files));
+    params.add("files", toJsonArray(files));
    sendMessage("setInputFiles", params);
  }

@@ -881,17 +812,17 @@ public class FrameImpl extends ChannelOwner implements Frame {

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

-  void waitForLoadStateImpl(LoadState state, WaitForLoadStateOptions options, Logger logger) {
-    waitForLoadStateImpl(convertType(state, WaitUntilState.class), options, logger);
+  void waitForLoadStateImpl(LoadState state, WaitForLoadStateOptions options) {
+    waitForLoadStateImpl(convertType(state, WaitUntilState.class), options);
  }

-  private void waitForLoadStateImpl(WaitUntilState state, WaitForLoadStateOptions options, Logger logger) {
+  private void waitForLoadStateImpl(WaitUntilState state, WaitForLoadStateOptions options) {
    if (options == null) {
      options = new WaitForLoadStateOptions();
    }
@@ -900,7 +831,7 @@ public class FrameImpl extends ChannelOwner implements Frame {
    }

    List<Waitable<Void>> waitables = new ArrayList<>();
-    waitables.add(new WaitForLoadStateHelper(state, logger));
+    waitables.add(new WaitForLoadStateHelper(state));
    waitables.add(page.createWaitForCloseHelper());
    waitables.add(page.createWaitableTimeout(options.timeout));
    runUntil(() -> {}, new WaitableRace<>(waitables));
@@ -908,12 +839,10 @@ public class FrameImpl extends ChannelOwner implements Frame {

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

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

    @Override
    public void accept(WaitUntilState state) {
-      logger.log("  load state changed to " + state);
      if (expectedState.equals(state)) {
        isDone = true;
        dispose();
@@ -946,24 +874,20 @@ public class FrameImpl extends ChannelOwner implements Frame {
  private class WaitForNavigationHelper implements Waitable<Response>, Consumer<JsonObject> {
    private final UrlMatcher matcher;
    private final WaitUntilState expectedLoadState;
-    private final Logger logger;
    private WaitForLoadStateHelper loadStateHelper;

    private RequestImpl request;
    private RuntimeException exception;

-    WaitForNavigationHelper(UrlMatcher matcher, WaitUntilState expectedLoadState, Logger logger) {
+    WaitForNavigationHelper(UrlMatcher matcher, WaitUntilState expectedLoadState) {
      this.matcher = matcher;
      this.expectedLoadState = expectedLoadState;
-      this.logger = logger;
      internalListeners.add(InternalEventType.NAVIGATED, this);
    }

    @Override
    public void accept(JsonObject params) {
-      String url = params.get("url").getAsString();
-      logger.log("  navigated to " + url);
-      if (!matcher.test(url)) {
+      if (!matcher.test(params.get("url").getAsString())) {
        return;
      }
      if (params.has("error")) {
@@ -975,7 +899,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);
    }
@@ -1014,14 +938,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();
    }
@@ -1033,8 +957,7 @@ public class FrameImpl extends ChannelOwner implements Frame {
    if (matcher == null) {
      matcher = UrlMatcher.forOneOf(page.context().baseUrl, options.url);
    }
-    logger.log("waiting for navigation " + matcher);
-    waitables.add(new WaitForNavigationHelper(matcher, options.waitUntil, logger));
+    waitables.add(new WaitForNavigationHelper(matcher, options.waitUntil));
    waitables.add(page.createWaitForCloseHelper());
    waitables.add(page.createWaitableFrameDetach(this));
    waitables.add(page.createWaitableNavigationTimeout(options.timeout));
@@ -1092,22 +1015,18 @@ public class FrameImpl extends ChannelOwner implements Frame {
  }

  private void waitForURL(UrlMatcher matcher, WaitForURLOptions options) {
-    withWaitLogging("Frame.waitForURL", logger -> {
-      waitForURLImpl(logger, matcher, options);
-      return null;
-    });
+    withLogging("Frame.waitForURL", () -> waitForURLImpl(matcher, options));
  }

-  void waitForURLImpl(Logger logger, UrlMatcher matcher, WaitForURLOptions options) {
-    logger.log("waiting for url " + matcher);
+  void waitForURLImpl(UrlMatcher matcher, WaitForURLOptions options) {
    if (options == null) {
      options = new WaitForURLOptions();
    }
    if (matcher.test(url())) {
-      waitForLoadStateImpl(options.waitUntil, convertType(options, WaitForLoadStateOptions.class), logger);
+      waitForLoadStateImpl(options.waitUntil, convertType(options, WaitForLoadStateOptions.class));
      return;
    }
-    waitForNavigationImpl(logger, () -> {}, convertType(options, WaitForNavigationOptions.class), matcher);
+    waitForNavigationImpl(() -> {}, convertType(options, WaitForNavigationOptions.class), matcher);
  }

  int queryCount(String selector) {
@@ -1129,13 +1048,6 @@ public class FrameImpl extends ChannelOwner implements Frame {
      if (add != null) {
        WaitUntilState state = loadStateFromProtocol(add.getAsString());
        loadStates.add(state);
-        if (parentFrame == null && page != null) {
-          if (state == LOAD) {
-            page.listeners.notify(PageImpl.EventType.LOAD, page);
-          } else if (state == DOMCONTENTLOADED) {
-            page.listeners.notify(PageImpl.EventType.DOMCONTENTLOADED, page);
-          }
-        }
        internalListeners.notify(InternalEventType.LOADSTATE, state);
      }
      JsonElement remove = params.get("remove");
@@ -18,12 +18,7 @@ package com.microsoft.playwright.impl;

 import com.microsoft.playwright.FrameLocator;
 import com.microsoft.playwright.Locator;
-import com.microsoft.playwright.PlaywrightException;
-import com.microsoft.playwright.options.AriaRole;

-import java.util.regex.Pattern;
-
-import static com.microsoft.playwright.impl.LocatorUtils.*;
 import static com.microsoft.playwright.impl.Utils.convertType;

 class FrameLocatorImpl implements FrameLocator {
@@ -42,72 +37,7 @@ class FrameLocatorImpl implements FrameLocator {

  @Override
  public FrameLocatorImpl frameLocator(String selector) {
-    return new FrameLocatorImpl(frame, frameSelector + " >> internal:control=enter-frame >> " + selector);
-  }
-
-  @Override
-  public Locator getByAltText(String text, GetByAltTextOptions options) {
-    return locator(getByAltTextSelector(text, convertType(options, Locator.GetByAltTextOptions.class)));
-  }
-
-  @Override
-  public Locator getByAltText(Pattern text, GetByAltTextOptions options) {
-    return locator(getByAltTextSelector(text, convertType(options, Locator.GetByAltTextOptions.class)));
-  }
-
-  @Override
-  public Locator getByLabel(String text, GetByLabelOptions options) {
-    return locator(getByLabelSelector(text, convertType(options, Locator.GetByLabelOptions.class)));
-  }
-
-  @Override
-  public Locator getByLabel(Pattern text, GetByLabelOptions options) {
-    return locator(getByLabelSelector(text, convertType(options, Locator.GetByLabelOptions.class)));
-  }
-
-  @Override
-  public Locator getByPlaceholder(String text, GetByPlaceholderOptions options) {
-    return locator(getByPlaceholderSelector(text, convertType(options, Locator.GetByPlaceholderOptions.class)));
-  }
-
-  @Override
-  public Locator getByPlaceholder(Pattern text, GetByPlaceholderOptions options) {
-    return locator(getByPlaceholderSelector(text, convertType(options, Locator.GetByPlaceholderOptions.class)));
-  }
-
-  @Override
-  public Locator getByRole(AriaRole role, GetByRoleOptions options) {
-    return locator(getByRoleSelector(role, convertType(options, Locator.GetByRoleOptions.class)));
-  }
-
-  @Override
-  public Locator getByTestId(String testId) {
-    return locator(getByTestIdSelector(testId, frame.connection.playwright));
-  }
-
-  @Override
-  public Locator getByTestId(Pattern testId) {
-    return locator(getByTestIdSelector(testId, frame.connection.playwright));
-  }
-
-  @Override
-  public Locator getByText(String text, GetByTextOptions options) {
-    return locator(getByTextSelector(text, convertType(options, Locator.GetByTextOptions.class)));
-  }
-
-  @Override
-  public Locator getByText(Pattern text, GetByTextOptions options) {
-    return locator(getByTextSelector(text, convertType(options, Locator.GetByTextOptions.class)));
-  }
-
-  @Override
-  public Locator getByTitle(String text, GetByTitleOptions options) {
-    return locator(getByTitleSelector(text, convertType(options, Locator.GetByTitleOptions.class)));
-  }
-
-  @Override
-  public Locator getByTitle(Pattern text, GetByTitleOptions options) {
-    return locator(getByTitleSelector(text, convertType(options, Locator.GetByTitleOptions.class)));
+    return new FrameLocatorImpl(frame, frameSelector + " >> control=enter-frame >> " + selector);
  }

  @Override
@@ -117,25 +47,11 @@ class FrameLocatorImpl implements FrameLocator {

  @Override
  public Locator locator(String selector, LocatorOptions options) {
-    return new LocatorImpl(frame, frameSelector + " >> internal:control=enter-frame >> " + selector, convertType(options, Locator.LocatorOptions.class));
-  }
-
-  @Override
-  public Locator locator(Locator selectorOrLocator, LocatorOptions options) {
-    LocatorImpl other = (LocatorImpl) selectorOrLocator;
-    if (other.frame != frame) {
-      throw new PlaywrightException("Locators must belong to the same frame.");
-    }
-    return locator(other.selector, options);
+    return new LocatorImpl(frame, frameSelector + " >> control=enter-frame >> " + selector, convertType(options, Locator.LocatorOptions.class));
  }

  @Override
  public FrameLocator nth(int index) {
    return new FrameLocatorImpl(frame, frameSelector + " >> nth=" + index);
  }
-
-  @Override
-  public Locator owner() {
-    return new LocatorImpl(frame, frameSelector);
-  }
 }
@@ -1,112 +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();
-      // If the response status is -1, the request was canceled or stalled, so we just stall it here.
-      // See https://github.com/microsoft/playwright/issues/29311.
-      // TODO: it'd be better to abort such requests, but then we likely need to respect the timing,
-      // because the request might have been stalled for a long time until the very end of the
-      // test when HAR was recorded but we'd abort it immediately.
-      if (status == -1) {
-        return;
-      }
-      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);
-  }
-}
@@ -41,12 +41,7 @@ public class JSHandleImpl extends ChannelOwner implements JSHandle {

  @Override
  public void dispose() {
-    withLogging("JSHandle.dispose", () -> {
-      try {
-        sendMessage("dispose");
-      } catch (TargetClosedError e) {
-      }
-    });
+    withLogging("JSHandle.dispose", () -> sendMessage("dispose"));
  }

  @Override
@@ -33,7 +33,6 @@ class JsonPipe extends ChannelOwner implements Transport {
  private ListenerCollection<EventType> listeners = new ListenerCollection<>();
  private enum EventType { CLOSE }
  private boolean isClosed;
-  private String closeReason = "Browser has been closed";

  JsonPipe(ChannelOwner parent, String type, String guid, JsonObject initializer) {
    super(parent, type, guid, initializer);
@@ -98,19 +97,13 @@ class JsonPipe extends ChannelOwner implements Transport {
      incoming.add(params.get("message").getAsJsonObject());
    } else if ("closed".equals(event)) {
      isClosed = true;
-      if (params.has("reason")) {
-        String reason = params.get("reason").getAsString();
-        if (reason.trim().length() > 0) {
-          closeReason = reason;
-        }
-      }
      listeners.notify(EventType.CLOSE, this);
    }
  }

  private void checkIfClosed() {
    if (isClosed) {
-      throw new PlaywrightException(closeReason);
+      throw new PlaywrightException("Browser has been closed");
    }
  }
 }
@@ -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);
-  }
 }
@@ -20,42 +20,16 @@ import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;

 import java.nio.file.Path;
-import java.util.List;
-
-import static com.microsoft.playwright.impl.Serialization.gson;

 class LocalUtils extends ChannelOwner {
  LocalUtils(ChannelOwner parent, String type, String guid, JsonObject initializer) {
    super(parent, type, guid, initializer);
  }

-  JsonArray deviceDescriptors() {
-    return initializer.getAsJsonArray("deviceDescriptors");
-  }
-
-  void zip(Path zipFile, JsonArray entries, String stacksId, boolean appendMode, boolean includeSources) {
+  void zip(Path zipFile, JsonArray entries) {
    JsonObject params = new JsonObject();
    params.addProperty("zipFile", zipFile.toString());
    params.add("entries", entries);
-    params.addProperty("mode", appendMode ? "append" : "write");
-    params.addProperty("stacksId", stacksId);
-    params.addProperty("includeSources", includeSources);
    sendMessage("zip", params);
  }
-
-  void traceDiscarded(String stacksId) {
-    JsonObject params = new JsonObject();
-    params.addProperty("stacksId", stacksId);
-    sendMessage("traceDiscarded", params);
-  }
-
-  String tracingStarted(String tracesDir, String traceName) {
-    JsonObject params = new JsonObject();
-    if (tracesDir != null) {
-      params.addProperty("tracesDir", "");
-    }
-    params.addProperty("traceName", traceName);
-    JsonObject json = connection.localUtils().sendMessage("tracingStarted", params).getAsJsonObject();
-    return json.get("stacksId").getAsString();
-  }
 }
@@ -18,9 +18,7 @@ package com.microsoft.playwright.impl;

 import com.microsoft.playwright.Locator;
 import com.microsoft.playwright.assertions.LocatorAssertions;
-import com.microsoft.playwright.options.AriaRole;

-import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Pattern;
@@ -41,7 +39,6 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
  public void containsText(String text, ContainsTextOptions options) {
    ExpectedTextValue expected = new ExpectedTextValue();
    expected.string = text;
-    expected.ignoreCase = shouldIgnoreCase(options);
    expected.matchSubstring = true;
    expected.normalizeWhiteSpace = true;
    expectImpl("to.have.text", expected, text, "Locator expected to contain text", convertType(options, FrameExpectOptions.class));
@@ -50,7 +47,6 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
  @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));
@@ -62,7 +58,6 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
    for (String text : strings) {
      ExpectedTextValue expected = new ExpectedTextValue();
      expected.string = text;
-      expected.ignoreCase = shouldIgnoreCase(options);
      expected.matchSubstring = true;
      expected.normalizeWhiteSpace = true;
      list.add(expected);
@@ -75,7 +70,6 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
    List<ExpectedTextValue> list = new ArrayList<>();
    for (Pattern pattern : patterns) {
      ExpectedTextValue expected = expectedRegex(pattern);
-      expected.ignoreCase = shouldIgnoreCase(options);
      expected.matchSubstring = true;
      expected.normalizeWhiteSpace = true;
      list.add(expected);
@@ -83,48 +77,16 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
    expectImpl("to.contain.text.array", list, patterns, "Locator expected to contain text", convertType(options, FrameExpectOptions.class));
  }

-  @Override
-  public void hasAccessibleDescription(String description, HasAccessibleDescriptionOptions options) {
-    ExpectedTextValue expected = new ExpectedTextValue();
-    expected.string = description;
-    expected.ignoreCase = shouldIgnoreCase(options);
-    expectImpl("to.have.accessible.description", expected, description, "Locator expected to have accessible description", convertType(options, FrameExpectOptions.class));
-  }
-
-  @Override
-  public void hasAccessibleDescription(Pattern pattern, HasAccessibleDescriptionOptions options) {
-    ExpectedTextValue expected = expectedRegex(pattern);
-    expected.ignoreCase = shouldIgnoreCase(options);
-    expectImpl("to.have.accessible.description", expected, pattern, "Locator expected to have accessible description", convertType(options, FrameExpectOptions.class));
-  }
-
-  @Override
-  public void hasAccessibleName(String name, HasAccessibleNameOptions options) {
-    ExpectedTextValue expected = new ExpectedTextValue();
-    expected.string = name;
-    expected.ignoreCase = shouldIgnoreCase(options);
-    expectImpl("to.have.accessible.name", expected, name, "Locator expected to have accessible name", convertType(options, FrameExpectOptions.class));
-  }
-
-  @Override
-  public void hasAccessibleName(Pattern pattern, HasAccessibleNameOptions options) {
-    ExpectedTextValue expected = expectedRegex(pattern);
-    expected.ignoreCase = shouldIgnoreCase(options);
-    expectImpl("to.have.accessible.name", expected, pattern, "Locator expected to have accessible name", convertType(options, FrameExpectOptions.class));
-  }
-
  @Override
  public void hasAttribute(String name, String text, HasAttributeOptions options) {
    ExpectedTextValue expected = new ExpectedTextValue();
    expected.string = text;
-    expected.ignoreCase = shouldIgnoreCase(options);
    hasAttribute(name, expected, text, options);
  }

  @Override
  public void hasAttribute(String name, Pattern pattern, HasAttributeOptions options) {
    ExpectedTextValue expected = expectedRegex(pattern);
-    expected.ignoreCase = shouldIgnoreCase(options);
    hasAttribute(name, expected, pattern, options);
  }

@@ -138,7 +100,7 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
    if (expectedValue instanceof Pattern) {
      message += " matching regex";
    }
-    expectImpl("to.have.attribute.value", expectedText, expectedValue, message, commonOptions);
+    expectImpl("to.have.attribute", expectedText, expectedValue, message, commonOptions);
  }

  @Override
@@ -181,7 +143,7 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
      options = new HasCountOptions();
    }
    FrameExpectOptions commonOptions = convertType(options, FrameExpectOptions.class);
-    commonOptions.expectedNumber = (double) count;
+    commonOptions.expectedNumber = count;
    List<ExpectedTextValue> expectedText = null;
    expectImpl("to.have.count", expectedText, count, "Locator expected to have count", commonOptions);
  }
@@ -237,18 +199,10 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
    expectImpl("to.have.property", list, value, "Locator expected to have JavaScript property '" + name + "'", commonOptions);
  }

-  @Override
-  public void hasRole(AriaRole role, HasRoleOptions options) {
-    ExpectedTextValue expected = new ExpectedTextValue();
-    expected.string = role.toString().toLowerCase();
-    expectImpl("to.have.role", expected, expected.string, "Locator expected to have role", convertType(options, FrameExpectOptions.class));
-  }
-
  @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));
@@ -257,7 +211,6 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
  @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;
@@ -270,7 +223,6 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
    for (String text : strings) {
      ExpectedTextValue expected = new ExpectedTextValue();
      expected.string = text;
-      expected.ignoreCase = shouldIgnoreCase(options);
      expected.matchSubstring = false;
      expected.normalizeWhiteSpace = true;
      list.add(expected);
@@ -283,7 +235,6 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
    List<ExpectedTextValue> list = new ArrayList<>();
    for (Pattern pattern : patterns) {
      ExpectedTextValue expected = expectedRegex(pattern);
-      expected.ignoreCase = shouldIgnoreCase(options);
      expected.matchSubstring = true;
      expected.normalizeWhiteSpace = true;
      list.add(expected);
@@ -304,34 +255,9 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
    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) {
-    boolean unchecked = options != null && options.checked != null && !options.checked;
-    String expression = unchecked ? "to.be.unchecked" : "to.be.checked";
-    String message = "Locator expected to be " + (unchecked ? "un" : "") + "checked";
-    expectTrue(expression, message, convertType(options, FrameExpectOptions.class));
+    expectTrue("to.be.checked", "Locator expected to be checked", convertType(options, FrameExpectOptions.class));
  }

  @Override
@@ -341,10 +267,7 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse

  @Override
  public void isEditable(IsEditableOptions options) {
-    FrameExpectOptions frameOptions = convertType(options, FrameExpectOptions.class);
-    boolean editable = options == null || options.editable == null || options.editable == true;
-    String message = "Locator expected to be " + (editable ? "editable" : "readonly");
-    expectTrue(editable ? "to.be.editable" : "to.be.readonly", message, frameOptions);
+    expectTrue("to.be.editable", "Locator expected to be editable", convertType(options, FrameExpectOptions.class));
  }

  @Override
@@ -354,10 +277,7 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse

  @Override
  public void isEnabled(IsEnabledOptions options) {
-    FrameExpectOptions frameOptions = convertType(options, FrameExpectOptions.class);
-    boolean enabled = options == null || options.enabled == null || options.enabled == true;
-    String message = "Locator expected to be " + (enabled ? "enabled" : "disabled");
-    expectTrue(enabled ? "to.be.enabled" : "to.be.disabled", message, frameOptions);
+    expectTrue("to.be.enabled", "Locator expected to be enabled", convertType(options, FrameExpectOptions.class));
  }

  @Override
@@ -370,21 +290,9 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
    expectTrue("to.be.hidden", "Locator expected to be hidden", convertType(options, FrameExpectOptions.class));
  }

-  @Override
-  public void isInViewport(IsInViewportOptions options) {
-    FrameExpectOptions expectOptions = convertType(options, FrameExpectOptions.class);
-    if (options != null && options.ratio != null) {
-      expectOptions.expectedNumber = options.ratio;
-    }
-    expectTrue("to.be.in.viewport", "Locator expected to be in viewport",  expectOptions);
-  }
-
  @Override
  public void isVisible(IsVisibleOptions options) {
-    FrameExpectOptions frameOptions = convertType(options, FrameExpectOptions.class);
-    boolean visible = options == null || options.visible == null || options.visible == true;
-    String message = "Locator expected to be " + (visible ? "visible" : "hidden");
-    expectTrue(visible ? "to.be.visible" : "to.be.hidden", message, frameOptions);
+    expectTrue("to.be.visible", "Locator expected to be visible", convertType(options, FrameExpectOptions.class));
  }

  private void expectTrue(String expression, String message, FrameExpectOptions options) {
@@ -396,12 +304,5 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
  public LocatorAssertions not() {
    return new LocatorAssertionsImpl(actualLocator, !isNot);
  }
-
-  @Override
-  public void isAttached(IsAttachedOptions options) {
-    FrameExpectOptions frameOptions = convertType(options, FrameExpectOptions.class);
-    boolean attached = options == null || options.attached == null || options.attached == true;
-    String message = "Locator expected to be " + (attached ? "attached" : "detached");
-    expectTrue(attached ? "to.be.attached" : "to.be.detached", message, frameOptions);
-  }
 }
+
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Yury Semikhatsky	ad2cebb6cb	devops: fix docker publish workflow (#898 ) (#900 )	2022-04-12 12:09:47 -07:00
Yury Semikhatsky	eb97940e7a	fix: get docker version from pom.xml (#899 )	2022-04-12 12:08:26 -07:00
Yury Semikhatsky	9049460aca	chore: roll release 1.21.0 driver (#896 )	2022-04-12 10:46:14 -07:00
Yury Semikhatsky	0259e78182	chore: mark 1.21.0 (#895 )	2022-04-12 10:30:12 -07:00