some more inlining

Author: Skn0tt

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

@@ -324,14 +324,16 @@ public void addCookies(List<Cookie> cookies) {
 
   @Override
   public void addInitScript(String script) {
-    addInitScriptImpl(script);
+    JsonObject params = new JsonObject();
+    params.addProperty("source", script);
+    sendMessage("addInitScript", params);
   }
 
   @Override
   public void addInitScript(Path path) {
     try {
       byte[] bytes = readAllBytes(path);
-      addInitScriptImpl(new String(bytes, UTF_8));
+      addInitScript(new String(bytes, UTF_8));
     } catch (IOException e) {
       throw new PlaywrightException("Failed to read script from file", e);
     }
@@ -342,12 +344,6 @@ public List<Page> backgroundPages() {
     return new ArrayList<>(backgroundPages);
   }
 
-  private void addInitScriptImpl(String script) {
-    JsonObject params = new JsonObject();
-    params.addProperty("source", script);
-    sendMessage("addInitScript", params);
-  }
-
   @Override
   public BrowserImpl browser() {
     return browser;

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

@@ -66,10 +66,6 @@ public BrowserType browserType() {
 
   @Override
   public void close(CloseOptions options) {
-    closeImpl(options);
-  }
-
-  private void closeImpl(CloseOptions options) {
     if (options == null) {
       options = new CloseOptions();
     }
@@ -188,10 +184,6 @@ public Page newPage(NewPageOptions options) {
 
   @Override
   public void startTracing(Page page, StartTracingOptions options) {
-    startTracingImpl(page, options);
-  }
-
-  private void startTracingImpl(Page page, StartTracingOptions options) {
     if (options == null) {
       options = new StartTracingOptions();
     }
@@ -205,10 +197,6 @@ private void startTracingImpl(Page page, StartTracingOptions options) {
 
   @Override
   public byte[] stopTracing() {
-    return stopTracingImpl();
-  }
-
-  private byte[] stopTracingImpl() {
     JsonObject json = sendMessage("stopTracing").getAsJsonObject();
     ArtifactImpl artifact = connection.getExistingObject(json.getAsJsonObject().getAsJsonObject("artifact").get("guid").getAsString());
     byte[] data = artifact.readAllBytes();

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

@@ -58,7 +58,7 @@ public void setFiles(Path files, SetFilesOptions options) {
 
   @Override
   public void setFiles(Path[] files, SetFilesOptions options) {
-    element.setInputFilesImpl(files, convertType(options, ElementHandle.SetInputFilesOptions.class));
+    element.setInputFiles(files, convertType(options, ElementHandle.SetInputFilesOptions.class));
   }
 
   @Override
@@ -68,6 +68,6 @@ public void setFiles(FilePayload files, SetFilesOptions options) {
 
   @Override
   public void setFiles(FilePayload[] files, SetFilesOptions options) {
-    element.setInputFilesImpl(files, convertType(options, ElementHandle.SetInputFilesOptions.class));
+    element.setInputFiles(files, convertType(options, ElementHandle.SetInputFilesOptions.class));
   }
 }

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

@@ -214,10 +214,6 @@ ElementHandle addStyleTagImpl(AddStyleTagOptions options) {
 
   @Override
   public void check(String selector, CheckOptions options){
-    checkImpl(selector, options);
-  }
-
-  void checkImpl(String selector, CheckOptions options) {
     if (options == null) {
       options = new CheckOptions();
     }
@@ -249,19 +245,11 @@ void clickImpl(String selector, ClickOptions options) {
 
   @Override
   public String content() {
-    return contentImpl();
-  }
-
-  String contentImpl() {
     return sendMessage("content").getAsJsonObject().get("value").getAsString();
   }
 
   @Override
   public void dblclick(String selector, DblclickOptions options) {
-    dblclickImpl(selector, options);
-  }
-
-  void dblclickImpl(String selector, DblclickOptions options) {
     if (options == null) {
       options = new DblclickOptions();
     }
@@ -273,10 +261,6 @@ void dblclickImpl(String selector, DblclickOptions options) {
 
   @Override
   public void dispatchEvent(String selector, String type, Object eventInit, DispatchEventOptions options) {
-    dispatchEventImpl(selector, type, eventInit, options);
-  }
-
-  void dispatchEventImpl(String selector, String type, Object eventInit, DispatchEventOptions options) {
     if (options == null) {
       options = new DispatchEventOptions();
     }
@@ -290,10 +274,6 @@ void dispatchEventImpl(String selector, String type, Object eventInit, DispatchE
 
   @Override
   public Object evaluate(String expression, Object arg) {
-    return evaluateImpl(expression, arg);
-  }
-
-  Object evaluateImpl(String expression, Object arg) {
     JsonObject params = new JsonObject();
     params.addProperty("expression", expression);
     params.addProperty("world", "main");
@@ -305,10 +285,6 @@ Object evaluateImpl(String expression, Object arg) {
 
   @Override
   public JSHandle evaluateHandle(String pageFunction, Object arg) {
-    return evaluateHandleImpl(pageFunction, arg);
-  }
-
-  JSHandle evaluateHandleImpl(String pageFunction, Object arg) {
     JsonObject params = new JsonObject();
     params.addProperty("expression", pageFunction);
     params.addProperty("world", "main");
@@ -319,10 +295,6 @@ JSHandle evaluateHandleImpl(String pageFunction, Object arg) {
 
   @Override
   public void fill(String selector, String value, FillOptions options) {
-    fillImpl(selector, value, options);
-  }
-
-  void fillImpl(String selector, String value, FillOptions options) {
     if (options == null) {
       options = new FillOptions();
     }
@@ -335,10 +307,6 @@ void fillImpl(String selector, String value, FillOptions options) {
 
   @Override
   public void focus(String selector, FocusOptions options) {
-    focusImpl(selector, options);
-  }
-
-  void focusImpl(String selector, FocusOptions options) {
     if (options == null) {
       options = new FocusOptions();
     }
@@ -350,20 +318,15 @@ void focusImpl(String selector, FocusOptions options) {
 
   @Override
   public ElementHandle frameElement() {
-    return frameElementImpl();
-
+    JsonObject json = sendMessage("frameElement").getAsJsonObject();
+    return connection.getExistingObject(json.getAsJsonObject("element").get("guid").getAsString());
   }
 
   @Override
   public FrameLocator frameLocator(String selector) {
     return new FrameLocatorImpl(this, selector);
   }
 
-  ElementHandle frameElementImpl() {
-    JsonObject json = sendMessage("frameElement").getAsJsonObject();
-    return connection.getExistingObject(json.getAsJsonObject("element").get("guid").getAsString());
-  }
-
   @Override
   public String getAttribute(String selector, String name, GetAttributeOptions options) {
     return getAttributeImpl(selector, name, options);
@@ -745,23 +708,14 @@ public void setChecked(String selector, boolean checked, SetCheckedOptions optio
 
   void setCheckedImpl(String selector, boolean checked, SetCheckedOptions options) {
     if (checked) {
-      checkImpl(selector, convertType(options, CheckOptions.class));
+      check(selector, convertType(options, CheckOptions.class));
     } else {
-      uncheckImpl(selector, convertType(options, UncheckOptions.class));
+      uncheck(selector, convertType(options, UncheckOptions.class));
     }
   }
 
   @Override
   public void setContent(String html, SetContentOptions options) {
-    setContentImpl(html, options);
-  }
-
-  @Override
-  public void setInputFiles(String selector, Path files, SetInputFilesOptions options) {
-    setInputFiles(selector, new Path[] {files}, options);
-  }
-
-  void setContentImpl(String html, SetContentOptions options) {
     if (options == null) {
       options = new SetContentOptions();
     }
@@ -771,6 +725,11 @@ void setContentImpl(String html, SetContentOptions options) {
     sendMessage("setContent", params);
   }
 
+  @Override
+  public void setInputFiles(String selector, Path files, SetInputFilesOptions options) {
+    setInputFiles(selector, new Path[] {files}, options);
+  }
+
   @Override
   public void setInputFiles(String selector, Path[] files, SetInputFilesOptions options) {
     setInputFilesImpl(selector, files, options);
@@ -811,9 +770,6 @@ void setInputFilesImpl(String selector, FilePayload[] files, SetInputFilesOption
 
   @Override
   public void tap(String selector, TapOptions options) {
-    tapImpl(selector, options);
-  }
-  void tapImpl(String selector, TapOptions options) {
     if (options == null) {
       options = new TapOptions();
     }
@@ -825,10 +781,6 @@ void tapImpl(String selector, TapOptions options) {
 
   @Override
   public String textContent(String selector, TextContentOptions options) {
-    return textContentImpl(selector, options);
-  }
-
-  String textContentImpl(String selector, TextContentOptions options) {
     if (options == null) {
       options = new TextContentOptions();
     }
@@ -840,20 +792,12 @@ String textContentImpl(String selector, TextContentOptions options) {
 
   @Override
   public String title() {
-    return titleImpl();
-  }
-
-  String titleImpl() {
     JsonElement json = sendMessage("title");
     return json.getAsJsonObject().get("value").getAsString();
   }
 
   @Override
   public void type(String selector, String text, TypeOptions options) {
-    typeImpl(selector, text, options);
-  }
-
-  void typeImpl(String selector, String text, TypeOptions options) {
     if (options == null) {
       options = new TypeOptions();
     }
@@ -866,10 +810,6 @@ void typeImpl(String selector, String text, TypeOptions options) {
 
   @Override
   public void uncheck(String selector, UncheckOptions options) {
-    uncheckImpl(selector, options);
-  }
-
-  void uncheckImpl(String selector, UncheckOptions options) {
     if (options == null) {
       options = new UncheckOptions();
     }
@@ -886,10 +826,6 @@ public String url() {
 
   @Override
   public JSHandle waitForFunction(String pageFunction, Object arg, WaitForFunctionOptions options) {
-    return waitForFunctionImpl(pageFunction, arg, options);
-  }
-
-  JSHandle waitForFunctionImpl(String pageFunction, Object arg, WaitForFunctionOptions options) {
     if (options == null) {
       options = new WaitForFunctionOptions();
     }
@@ -1066,10 +1002,6 @@ private Response waitForNavigationImpl(Logger logger, Runnable code, WaitForNavi
 
   @Override
   public ElementHandle waitForSelector(String selector, WaitForSelectorOptions options) {
-    return waitForSelectorImpl(selector, options);
-  }
-
-  ElementHandle waitForSelectorImpl(String selector, WaitForSelectorOptions options) {
     return waitForSelectorImpl(selector, options, false);
   }
 
@@ -1091,10 +1023,6 @@ ElementHandle waitForSelectorImpl(String selector, WaitForSelectorOptions option
 
   @Override
   public void waitForTimeout(double timeout) {
-    waitForTimeoutImpl(timeout);
-  }
-
-  void waitForTimeoutImpl(double timeout) {
     JsonObject params = new JsonObject();
     params.addProperty("timeout", timeout);
     sendMessage("waitForTimeout", params);