inline impls

Author: Skn0tt

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

@@ -53,10 +53,6 @@ public APIResponse delete(String url, RequestOptions options) {
 
   @Override
   public void dispose(DisposeOptions options) {
-    disposeImpl(options);
-  }
-
-  private void disposeImpl(DisposeOptions options) {
     if (options == null) {
       options = new DisposeOptions();
     }

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

@@ -39,10 +39,6 @@ class APIRequestImpl implements APIRequest {
 
   @Override
   public APIRequestContextImpl newContext(NewContextOptions options) {
-    return newContextImpl(options);
-  }
-
-  private APIRequestContextImpl newContextImpl(NewContextOptions options) {
     if (options == null) {
       options = new NewContextOptions();
     } else {

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

@@ -275,15 +275,6 @@ public CDPSession newCDPSession(Frame frame) {
 
   @Override
   public void close(CloseOptions options) {
-    closeImpl(options);
-  }
-
-  @Override
-  public List<Cookie> cookies(String url) {
-    return cookies(url == null ? new ArrayList<>() : Collections.singletonList(url));
-  }
-
-  private void closeImpl(CloseOptions options) {
     if (!closingOrClosed) {
       closingOrClosed = true;
       if (options == null) {
@@ -318,6 +309,12 @@ private void closeImpl(CloseOptions options) {
     runUntil(() -> {}, closePromise);
   }
 
+  @Override
+  public List<Cookie> cookies(String url) {
+    return cookies(url == null ? new ArrayList<>() : Collections.singletonList(url));
+  }
+
+
   @Override
   public void addCookies(List<Cookie> cookies) {
     JsonObject params = new JsonObject();
@@ -358,10 +355,6 @@ public BrowserImpl browser() {
 
   @Override
   public void clearCookies(ClearCookiesOptions options) {
-    clearCookiesImpl(options);
-  }
-
-  private void clearCookiesImpl(ClearCookiesOptions options) {
     if (options == null) {
       options = new ClearCookiesOptions();
     }
@@ -389,10 +382,6 @@ public void clearPermissions() {
 
   @Override
   public List<Cookie> cookies(List<String> urls) {
-    return cookiesImpl(urls);
-  }
-
-  private List<Cookie> cookiesImpl(List<String> urls) {
     JsonObject params = new JsonObject();
     if (urls == null) {
       urls = new ArrayList<>();
@@ -434,10 +423,6 @@ public void exposeFunction(String name, FunctionCallback playwrightFunction) {
 
   @Override
   public void grantPermissions(List<String> permissions, GrantPermissionsOptions options) {
-    grantPermissionsImpl(permissions, options);
-  }
-
-  private void grantPermissionsImpl(List<String> permissions, GrantPermissionsOptions options) {
     if (options == null) {
       options = new GrantPermissionsOptions();
     }
@@ -451,10 +436,6 @@ private void grantPermissionsImpl(List<String> permissions, GrantPermissionsOpti
 
   @Override
   public PageImpl newPage() {
-    return newPageImpl();
-  }
-
-  private PageImpl newPageImpl() {
     if (ownerPage != null) {
       throw new PlaywrightException("Please use browser.newContext()");
     }
@@ -593,10 +574,6 @@ public void setOffline(boolean offline) {
 
   @Override
   public String storageState(StorageStateOptions options) {
-    return storageStateImpl(options);
-  }
-
-  private String storageStateImpl(StorageStateOptions options) {
     if (options == null) {
       options = new StorageStateOptions();
     }

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

@@ -114,10 +114,6 @@ public boolean isConnected() {
 
   @Override
   public BrowserContextImpl newContext(NewContextOptions options) {
-    return newContextImpl(options);
-  }
-
-  private BrowserContextImpl newContextImpl(NewContextOptions options) {
     if (options == null) {
       options = new NewContextOptions();
     } else {

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

@@ -41,10 +41,6 @@ class BrowserTypeImpl extends ChannelOwner implements BrowserType {
 
   @Override
   public BrowserImpl launch(LaunchOptions options) {
-    return launchImpl(options);
-  }
-
-  private BrowserImpl launchImpl(LaunchOptions options) {
     if (options == null) {
       options = new LaunchOptions();
     }
@@ -59,10 +55,6 @@ private BrowserImpl launchImpl(LaunchOptions options) {
 
   @Override
   public Browser connect(String wsEndpoint, ConnectOptions options) {
-    return connectImpl(wsEndpoint, options);
-  }
-
-  private Browser connectImpl(String wsEndpoint, ConnectOptions options) {
     if (options == null) {
       options = new ConnectOptions();
     }
@@ -123,10 +115,6 @@ public Browser connectOverCDP(String endpointURL, ConnectOverCDPOptions options)
     if (!"chromium".equals(name())) {
       throw new PlaywrightException("Connecting over CDP is only supported in Chromium.");
     }
-    return connectOverCDPImpl(endpointURL, options);
-  }
-
-  private Browser connectOverCDPImpl(String endpointURL, ConnectOverCDPOptions options) {
     if (options == null) {
       options = new ConnectOverCDPOptions();
     }
@@ -147,10 +135,6 @@ public String executablePath() {
 
   @Override
   public BrowserContextImpl launchPersistentContext(Path userDataDir, LaunchPersistentContextOptions options) {
-    return launchPersistentContextImpl(userDataDir, options);
-  }
-
-  private BrowserContextImpl launchPersistentContextImpl(Path userDataDir, LaunchPersistentContextOptions options) {
     if (options == null) {
       options = new LaunchPersistentContextOptions();
     } else {

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

@@ -113,10 +113,6 @@ public BoundingBox boundingBox() {
 
   @Override
   public void check(CheckOptions options) {
-    checkImpl(options);
-  }
-
-  private void checkImpl(CheckOptions options) {
     if (options == null) {
       options = new CheckOptions();
     }
@@ -127,10 +123,6 @@ private void checkImpl(CheckOptions options) {
 
   @Override
   public void click(ClickOptions options) {
-    clickImpl(options);
-  }
-
-  private void clickImpl(ClickOptions options) {
     if (options == null) {
       options = new ClickOptions();
     }
@@ -141,10 +133,6 @@ private void clickImpl(ClickOptions options) {
 
   @Override
   public Frame contentFrame() {
-    return contentFrameImpl();
-  }
-
-  private Frame contentFrameImpl() {
     JsonObject json = sendMessage("contentFrame").getAsJsonObject();
     if (!json.has("frame")) {
       return null;
@@ -154,10 +142,6 @@ private Frame contentFrameImpl() {
 
   @Override
   public void dblclick(DblclickOptions options) {
-    dblclickImpl(options);
-  }
-
-  private void dblclickImpl(DblclickOptions options) {
     if (options == null) {
       options = new DblclickOptions();
     }
@@ -176,10 +160,6 @@ public void dispatchEvent(String type, Object eventInit) {
 
   @Override
   public void fill(String value, FillOptions options) {
-    fillImpl(value, options);
-  }
-
-  private void fillImpl(String value, FillOptions options) {
     if (options == null) {
       options = new FillOptions();
     }
@@ -204,10 +184,6 @@ public String getAttribute(String name) {
 
   @Override
   public void hover(HoverOptions options) {
-    hoverImpl(options);
-  }
-
-  private void hoverImpl(HoverOptions options) {
     if (options == null) {
       options = new HoverOptions();
     }
@@ -230,10 +206,6 @@ public String innerText() {
 
   @Override
   public String inputValue(InputValueOptions options) {
-    return inputValueImpl(options);
-  }
-
-  private String inputValueImpl(InputValueOptions options) {
     if (options == null) {
       options = new InputValueOptions();
     }
@@ -289,9 +261,6 @@ public FrameImpl ownerFrame() {
 
   @Override
   public void press(String key, PressOptions options) {
-    pressImpl(key, options);
-  }
-  private void pressImpl(String key, PressOptions options) {
     if (options == null) {
       options = new PressOptions();
     }
@@ -303,10 +272,6 @@ private void pressImpl(String key, PressOptions options) {
 
   @Override
   public byte[] screenshot(ScreenshotOptions options) {
-    return screenshotImpl(options);
-  }
-
-  private byte[] screenshotImpl(ScreenshotOptions options) {
     if (options == null) {
       options = new ScreenshotOptions();
     }
@@ -337,7 +302,12 @@ private byte[] screenshotImpl(ScreenshotOptions options) {
 
   @Override
   public void scrollIntoViewIfNeeded(ScrollIntoViewIfNeededOptions options) {
-    scrollIntoViewIfNeededImpl(options);
+    if (options == null) {
+      options = new ScrollIntoViewIfNeededOptions();
+    }
+    options.timeout = frame.timeout(options.timeout);
+    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
+    sendMessage("scrollIntoViewIfNeeded", params);
   }
 
   @Override
@@ -371,14 +341,6 @@ public List<String> selectOption(SelectOption value, SelectOptionOptions options
     return selectOption(values, options);
   }
 
-  private void scrollIntoViewIfNeededImpl(ScrollIntoViewIfNeededOptions options) {
-    if (options == null) {
-      options = new ScrollIntoViewIfNeededOptions();
-    }
-    options.timeout = frame.timeout(options.timeout);
-    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
-    sendMessage("scrollIntoViewIfNeeded", params);
-  }
 
   @Override
   public List<String> selectOption(SelectOption[] values, SelectOptionOptions options) {
@@ -411,7 +373,12 @@ private List<String> selectOption(JsonObject params) {
 
   @Override
   public void selectText(SelectTextOptions options) {
-    selectTextImpl(options);
+    if (options == null) {
+      options = new SelectTextOptions();
+    }
+    options.timeout = frame.timeout(options.timeout);
+    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
+    sendMessage("selectText", params);
   }
 
   @Override
@@ -428,21 +395,9 @@ public void setInputFiles(Path files, SetInputFilesOptions options) {
     setInputFiles(new Path[]{files}, options);
   }
 
-  private void selectTextImpl(SelectTextOptions options) {
-    if (options == null) {
-      options = new SelectTextOptions();
-    }
-    options.timeout = frame.timeout(options.timeout);
-    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
-    sendMessage("selectText", params);
-  }
 
   @Override
   public void setInputFiles(Path[] files, SetInputFilesOptions options) {
-    setInputFilesImpl(files, options);
-  }
-
-  void setInputFilesImpl(Path[] files, SetInputFilesOptions options) {
     FrameImpl frame = ownerFrame();
     if (frame == null) {
       throw new Error("Cannot set input files to detached element");
@@ -463,10 +418,6 @@ public void setInputFiles(FilePayload files, SetInputFilesOptions options) {
 
   @Override
   public void setInputFiles(FilePayload[] files, SetInputFilesOptions options) {
-    setInputFilesImpl(files, options);
-  }
-
-  void setInputFilesImpl(FilePayload[] files, SetInputFilesOptions options) {
     checkFilePayloadSize(files);
     if (options == null) {
       options = new SetInputFilesOptions();
@@ -479,10 +430,6 @@ void setInputFilesImpl(FilePayload[] files, SetInputFilesOptions options) {
 
   @Override
   public void tap(TapOptions options) {
-    tapImpl(options);
-  }
-
-  private void tapImpl(TapOptions options) {
     if (options == null) {
       options = new TapOptions();
     }
@@ -493,20 +440,12 @@ private void tapImpl(TapOptions options) {
 
   @Override
   public String textContent() {
-    return textContentImpl();
-  }
-
-  private String textContentImpl() {
     JsonObject json = sendMessage("textContent").getAsJsonObject();
     return json.has("value") ? json.get("value").getAsString() : null;
   }
 
   @Override
   public void type(String text, TypeOptions options) {
-    typeImpl(text, options);
-  }
-
-  private void typeImpl(String text, TypeOptions options) {
     if (options == null) {
       options = new TypeOptions();
     }
@@ -518,10 +457,6 @@ private void typeImpl(String text, TypeOptions options) {
 
   @Override
   public void uncheck(UncheckOptions options) {
-    uncheckImpl(options);
-  }
-
-  private void uncheckImpl(UncheckOptions options) {
     if (options == null) {
       options = new UncheckOptions();
     }
@@ -532,10 +467,6 @@ private void uncheckImpl(UncheckOptions options) {
 
   @Override
   public void waitForElementState(ElementState state, WaitForElementStateOptions options) {
-    waitForElementStateImpl(state, options);
-  }
-
-  private void waitForElementStateImpl(ElementState state, WaitForElementStateOptions options) {
     if (options == null) {
       options = new WaitForElementStateOptions();
     }
@@ -554,10 +485,6 @@ private static String toProtocol(ElementState state) {
 
   @Override
   public ElementHandle waitForSelector(String selector, WaitForSelectorOptions options) {
-    return waitForSelectorImpl(selector, options);
-  }
-
-  private ElementHandle waitForSelectorImpl(String selector, WaitForSelectorOptions options) {
     if (options == null) {
       options = new WaitForSelectorOptions();
     }