From 3987326db8a54a149080f10575b31c703c2b2d05 Mon Sep 17 00:00:00 2001 From: Simon Knott Date: Wed, 11 Jun 2025 15:36:26 +0200 Subject: [PATCH 1/3] remove withLogging --- .../impl/APIRequestContextImpl.java | 18 +- .../playwright/impl/APIRequestImpl.java | 5 +- .../playwright/impl/APIResponseImpl.java | 9 +- .../playwright/impl/BrowserContextImpl.java | 109 +++---- .../playwright/impl/BrowserImpl.java | 8 +- .../playwright/impl/BrowserTypeImpl.java | 9 +- .../playwright/impl/ChannelOwner.java | 7 - .../microsoft/playwright/impl/ClockImpl.java | 3 +- .../microsoft/playwright/impl/DialogImpl.java | 14 +- .../playwright/impl/DownloadImpl.java | 12 +- .../playwright/impl/ElementHandleImpl.java | 220 ++++++------- .../playwright/impl/FileChooserImpl.java | 6 +- .../microsoft/playwright/impl/FrameImpl.java | 90 +++--- .../playwright/impl/JSHandleImpl.java | 76 ++--- .../playwright/impl/KeyboardImpl.java | 28 +- .../playwright/impl/LocatorImpl.java | 6 +- .../playwright/impl/LoggingSupport.java | 24 -- .../microsoft/playwright/impl/MouseImpl.java | 18 +- .../microsoft/playwright/impl/PageImpl.java | 306 +++++++----------- .../playwright/impl/RequestImpl.java | 38 +-- .../playwright/impl/ResponseImpl.java | 34 +- .../microsoft/playwright/impl/RouteImpl.java | 12 +- .../playwright/impl/SelectorsImpl.java | 18 +- .../playwright/impl/TouchscreenImpl.java | 10 +- .../playwright/impl/TracingImpl.java | 4 +- .../microsoft/playwright/impl/VideoImpl.java | 47 ++- .../playwright/impl/WaitForEventLogger.java | 30 +- .../microsoft/playwright/impl/WorkerImpl.java | 26 +- 28 files changed, 485 insertions(+), 702 deletions(-) diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/APIRequestContextImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/APIRequestContextImpl.java index 90152d6c5..b40a111b2 100644 --- a/playwright/src/main/java/com/microsoft/playwright/impl/APIRequestContextImpl.java +++ b/playwright/src/main/java/com/microsoft/playwright/impl/APIRequestContextImpl.java @@ -53,7 +53,7 @@ public APIResponse delete(String url, RequestOptions options) { @Override public void dispose(DisposeOptions options) { - withLogging("APIRequestContext.dispose", () -> disposeImpl(options)); + disposeImpl(options); } private void disposeImpl(DisposeOptions options) { @@ -67,7 +67,7 @@ private void disposeImpl(DisposeOptions options) { @Override public APIResponse fetch(String urlOrRequest, RequestOptions options) { - return withLogging("APIRequestContext.fetch", () -> fetchImpl(urlOrRequest, (RequestOptionsImpl) options)); + return fetchImpl(urlOrRequest, (RequestOptionsImpl) options); } @Override @@ -220,14 +220,12 @@ public APIResponse put(String url, RequestOptions options) { @Override public String storageState(StorageStateOptions options) { - return withLogging("APIRequestContext.storageState", () -> { - JsonElement json = sendMessage("storageState"); - String storageState = json.toString(); - if (options != null && options.path != null) { - Utils.writeToFile(storageState.getBytes(StandardCharsets.UTF_8), options.path); - } - return storageState; - }); + JsonElement json = sendMessage("storageState"); + String storageState = json.toString(); + if (options != null && options.path != null) { + Utils.writeToFile(storageState.getBytes(StandardCharsets.UTF_8), options.path); + } + return storageState; } private static RequestOptionsImpl ensureOptions(RequestOptions options, String method) { diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/APIRequestImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/APIRequestImpl.java index 670e0e64d..e6b545418 100644 --- a/playwright/src/main/java/com/microsoft/playwright/impl/APIRequestImpl.java +++ b/playwright/src/main/java/com/microsoft/playwright/impl/APIRequestImpl.java @@ -17,7 +17,6 @@ package com.microsoft.playwright.impl; import com.google.gson.Gson; -import com.google.gson.JsonArray; import com.google.gson.JsonObject; import com.microsoft.playwright.APIRequest; import com.microsoft.playwright.PlaywrightException; @@ -26,12 +25,10 @@ import java.io.IOException; import java.nio.charset.StandardCharsets; import java.nio.file.Files; -import java.util.Base64; import java.util.List; import static com.microsoft.playwright.impl.Serialization.gson; import static com.microsoft.playwright.impl.Utils.addToProtocol; -import static java.nio.file.Files.readAllBytes; class APIRequestImpl implements APIRequest { private final PlaywrightImpl playwright; @@ -42,7 +39,7 @@ class APIRequestImpl implements APIRequest { @Override public APIRequestContextImpl newContext(NewContextOptions options) { - return playwright.withLogging("APIRequest.newContext", () -> newContextImpl(options)); + return newContextImpl(options); } private APIRequestContextImpl newContextImpl(NewContextOptions options) { diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/APIResponseImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/APIResponseImpl.java index 98d6dbbe6..d77aab8bb 100644 --- a/playwright/src/main/java/com/microsoft/playwright/impl/APIResponseImpl.java +++ b/playwright/src/main/java/com/microsoft/playwright/impl/APIResponseImpl.java @@ -17,7 +17,6 @@ package com.microsoft.playwright.impl; import com.google.gson.JsonArray; -import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.reflect.TypeToken; import com.microsoft.playwright.APIResponse; @@ -64,11 +63,9 @@ public byte[] body() { @Override public void dispose() { - context.withLogging("APIResponse.dispose", () -> { - JsonObject params = new JsonObject(); - params.addProperty("fetchUid", fetchUid()); - context.sendMessage("disposeAPIResponse", params); - }); + JsonObject params = new JsonObject(); + params.addProperty("fetchUid", fetchUid()); + context.sendMessage("disposeAPIResponse", params); } @Override diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/BrowserContextImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/BrowserContextImpl.java index 360763c5c..3cc6869c8 100644 --- a/playwright/src/main/java/com/microsoft/playwright/impl/BrowserContextImpl.java +++ b/playwright/src/main/java/com/microsoft/playwright/impl/BrowserContextImpl.java @@ -275,7 +275,7 @@ public CDPSession newCDPSession(Frame frame) { @Override public void close(CloseOptions options) { - withLogging("BrowserContext.close", () -> closeImpl(options)); + closeImpl(options); } @Override @@ -320,28 +320,24 @@ private void closeImpl(CloseOptions options) { @Override public void addCookies(List cookies) { - withLogging("BrowserContext.addCookies", () -> { - JsonObject params = new JsonObject(); - params.add("cookies", gson().toJsonTree(cookies)); - sendMessage("addCookies", params); - }); + JsonObject params = new JsonObject(); + params.add("cookies", gson().toJsonTree(cookies)); + sendMessage("addCookies", params); } @Override public void addInitScript(String script) { - withLogging("BrowserContext.addInitScript", () -> addInitScriptImpl(script)); + addInitScriptImpl(script); } @Override public void addInitScript(Path path) { - withLogging("BrowserContext.addInitScript", () -> { - try { - byte[] bytes = readAllBytes(path); - addInitScriptImpl(new String(bytes, UTF_8)); - } catch (IOException e) { - throw new PlaywrightException("Failed to read script from file", e); - } - }); + try { + byte[] bytes = readAllBytes(path); + addInitScriptImpl(new String(bytes, UTF_8)); + } catch (IOException e) { + throw new PlaywrightException("Failed to read script from file", e); + } } @Override @@ -362,7 +358,7 @@ public BrowserImpl browser() { @Override public void clearCookies(ClearCookiesOptions options) { - withLogging("BrowserContext.clearCookies", () -> clearCookiesImpl(options)); + clearCookiesImpl(options); } private void clearCookiesImpl(ClearCookiesOptions options) { @@ -388,12 +384,12 @@ private static void setStringOrRegex(JsonObject params, String name, Object valu @Override public void clearPermissions() { - withLogging("BrowserContext.clearPermissions", () -> sendMessage("clearPermissions")); + sendMessage("clearPermissions"); } @Override public List cookies(List urls) { - return withLogging("BrowserContext.cookies", () -> cookiesImpl(urls)); + return cookiesImpl(urls); } private List cookiesImpl(List urls) { @@ -409,7 +405,7 @@ private List cookiesImpl(List urls) { @Override public void exposeBinding(String name, BindingCallback playwrightBinding, ExposeBindingOptions options) { - withLogging("BrowserContext.exposeBinding", () -> exposeBindingImpl(name, playwrightBinding, options)); + exposeBindingImpl(name, playwrightBinding, options); } private void exposeBindingImpl(String name, BindingCallback playwrightBinding, ExposeBindingOptions options) { @@ -433,13 +429,12 @@ private void exposeBindingImpl(String name, BindingCallback playwrightBinding, E @Override public void exposeFunction(String name, FunctionCallback playwrightFunction) { - withLogging("BrowserContext.exposeFunction", - () -> exposeBindingImpl(name, (BindingCallback.Source source, Object... args) -> playwrightFunction.call(args), null)); + exposeBindingImpl(name, (BindingCallback.Source source, Object... args) -> playwrightFunction.call(args), null); } @Override public void grantPermissions(List permissions, GrantPermissionsOptions options) { - withLogging("BrowserContext.grantPermissions", () -> grantPermissionsImpl(permissions, options)); + grantPermissionsImpl(permissions, options); } private void grantPermissionsImpl(List permissions, GrantPermissionsOptions options) { @@ -456,7 +451,7 @@ private void grantPermissionsImpl(List permissions, GrantPermissionsOpti @Override public PageImpl newPage() { - return withLogging("BrowserContext.newPage", () -> newPageImpl()); + return newPageImpl(); } private PageImpl newPageImpl() { @@ -508,10 +503,8 @@ public void routeFromHAR(Path har, RouteFromHAROptions options) { } private void route(UrlMatcher matcher, Consumer handler, RouteOptions options) { - withLogging("BrowserContext.route", () -> { - routes.add(matcher, handler, options == null ? null : options.times); - updateInterceptionPatterns(); - }); + routes.add(matcher, handler, options == null ? null : options.times); + updateInterceptionPatterns(); } @Override @@ -530,10 +523,8 @@ public void routeWebSocket(Predicate predicate, Consumer } private void routeWebSocketImpl(UrlMatcher matcher, Consumer handler) { - withLogging("BrowserContext.routeWebSocket", () -> { - webSocketRoutes.add(matcher, handler); - updateWebSocketInterceptionPatterns(); - }); + webSocketRoutes.add(matcher, handler); + updateWebSocketInterceptionPatterns(); } void recordIntoHar(PageImpl page, Path har, RouteFromHAROptions options, HarContentPolicy contentPolicy) { @@ -572,43 +563,37 @@ public void setDefaultTimeout(double timeout) { @Override public void setExtraHTTPHeaders(Map headers) { - withLogging("BrowserContext.setExtraHTTPHeaders", () -> { - JsonObject params = new JsonObject(); - JsonArray jsonHeaders = new JsonArray(); - for (Map.Entry e : headers.entrySet()) { - JsonObject header = new JsonObject(); - header.addProperty("name", e.getKey()); - header.addProperty("value", e.getValue()); - jsonHeaders.add(header); - } - params.add("headers", jsonHeaders); - sendMessage("setExtraHTTPHeaders", params); - }); + JsonObject params = new JsonObject(); + JsonArray jsonHeaders = new JsonArray(); + for (Map.Entry e : headers.entrySet()) { + JsonObject header = new JsonObject(); + header.addProperty("name", e.getKey()); + header.addProperty("value", e.getValue()); + jsonHeaders.add(header); + } + params.add("headers", jsonHeaders); + sendMessage("setExtraHTTPHeaders", params); } @Override public void setGeolocation(Geolocation geolocation) { - withLogging("BrowserContext.setGeolocation", () -> { - JsonObject params = new JsonObject(); - if (geolocation != null) { - params.add("geolocation", gson().toJsonTree(geolocation)); - } - sendMessage("setGeolocation", params); - }); + JsonObject params = new JsonObject(); + if (geolocation != null) { + params.add("geolocation", gson().toJsonTree(geolocation)); + } + sendMessage("setGeolocation", params); } @Override public void setOffline(boolean offline) { - withLogging("BrowserContext.setOffline", () -> { - JsonObject params = new JsonObject(); - params.addProperty("offline", offline); - sendMessage("setOffline", params); - }); + JsonObject params = new JsonObject(); + params.addProperty("offline", offline); + sendMessage("setOffline", params); } @Override public String storageState(StorageStateOptions options) { - return withLogging("BrowserContext.storageState", () -> storageStateImpl(options)); + return storageStateImpl(options); } private String storageStateImpl(StorageStateOptions options) { @@ -633,10 +618,8 @@ public TracingImpl tracing() { @Override public void unrouteAll() { - withLogging("BrowserContext.unrouteAll", () -> { - routes.removeAll(); - updateInterceptionPatterns(); - }); + routes.removeAll(); + updateInterceptionPatterns(); } @Override @@ -687,10 +670,8 @@ public R get() { } private void unroute(UrlMatcher matcher, Consumer handler) { - withLogging("BrowserContext.unroute", () -> { - routes.remove(matcher, handler); - updateInterceptionPatterns(); - }); + routes.remove(matcher, handler); + updateInterceptionPatterns(); } private void updateInterceptionPatterns() { diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/BrowserImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/BrowserImpl.java index 45e25587e..2c91b284c 100644 --- a/playwright/src/main/java/com/microsoft/playwright/impl/BrowserImpl.java +++ b/playwright/src/main/java/com/microsoft/playwright/impl/BrowserImpl.java @@ -66,7 +66,7 @@ public BrowserType browserType() { @Override public void close(CloseOptions options) { - withLogging("Browser.close", () -> closeImpl(options)); + closeImpl(options); } private void closeImpl(CloseOptions options) { @@ -114,7 +114,7 @@ public boolean isConnected() { @Override public BrowserContextImpl newContext(NewContextOptions options) { - return withLogging("Browser.newContext", () -> newContextImpl(options)); + return newContextImpl(options); } private BrowserContextImpl newContextImpl(NewContextOptions options) { @@ -192,7 +192,7 @@ public Page newPage(NewPageOptions options) { @Override public void startTracing(Page page, StartTracingOptions options) { - withLogging("Browser.startTracing", () -> startTracingImpl(page, options)); + startTracingImpl(page, options); } private void startTracingImpl(Page page, StartTracingOptions options) { @@ -209,7 +209,7 @@ private void startTracingImpl(Page page, StartTracingOptions options) { @Override public byte[] stopTracing() { - return withLogging("Browser.stopTracing", () -> stopTracingImpl()); + return stopTracingImpl(); } private byte[] stopTracingImpl() { diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/BrowserTypeImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/BrowserTypeImpl.java index f8e4cd5d6..0f402f9a2 100644 --- a/playwright/src/main/java/com/microsoft/playwright/impl/BrowserTypeImpl.java +++ b/playwright/src/main/java/com/microsoft/playwright/impl/BrowserTypeImpl.java @@ -41,7 +41,7 @@ class BrowserTypeImpl extends ChannelOwner implements BrowserType { @Override public BrowserImpl launch(LaunchOptions options) { - return withLogging("BrowserType.launch", () -> launchImpl(options)); + return launchImpl(options); } private BrowserImpl launchImpl(LaunchOptions options) { @@ -59,7 +59,7 @@ private BrowserImpl launchImpl(LaunchOptions options) { @Override public Browser connect(String wsEndpoint, ConnectOptions options) { - return withLogging("BrowserType.connect", () -> connectImpl(wsEndpoint, options)); + return connectImpl(wsEndpoint, options); } private Browser connectImpl(String wsEndpoint, ConnectOptions options) { @@ -123,7 +123,7 @@ public Browser connectOverCDP(String endpointURL, ConnectOverCDPOptions options) if (!"chromium".equals(name())) { throw new PlaywrightException("Connecting over CDP is only supported in Chromium."); } - return withLogging("BrowserType.connectOverCDP", () -> connectOverCDPImpl(endpointURL, options)); + return connectOverCDPImpl(endpointURL, options); } private Browser connectOverCDPImpl(String endpointURL, ConnectOverCDPOptions options) { @@ -147,8 +147,7 @@ public String executablePath() { @Override public BrowserContextImpl launchPersistentContext(Path userDataDir, LaunchPersistentContextOptions options) { - return withLogging("BrowserType.launchPersistentContext", - () -> launchPersistentContextImpl(userDataDir, options)); + return launchPersistentContextImpl(userDataDir, options); } private BrowserContextImpl launchPersistentContextImpl(Path userDataDir, LaunchPersistentContextOptions options) { diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/ChannelOwner.java b/playwright/src/main/java/com/microsoft/playwright/impl/ChannelOwner.java index 47a7aec6d..8ce95bbce 100644 --- a/playwright/src/main/java/com/microsoft/playwright/impl/ChannelOwner.java +++ b/playwright/src/main/java/com/microsoft/playwright/impl/ChannelOwner.java @@ -82,13 +82,6 @@ T withWaitLogging(String apiName, Function code) { return new WaitForEventLogger<>(this, apiName, code).get(); } - @Deprecated - @Override - T withLogging(String apiName, Supplier code) { - // this has so many callers, removing it would clutter this PR. - // it's a no-op for now, and i'll remove it from the codebase in the next PR. - return super.withLogging(apiName, code); - } void withTitle(String title, Runnable code) { withTitle(title, () -> { diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/ClockImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/ClockImpl.java index 4380428fd..77a5a916a 100644 --- a/playwright/src/main/java/com/microsoft/playwright/impl/ClockImpl.java +++ b/playwright/src/main/java/com/microsoft/playwright/impl/ClockImpl.java @@ -14,8 +14,7 @@ class ClockImpl implements Clock { private void sendMessageWithLogging(String method, JsonObject params) { String capitalizedMethod = method.substring(0, 1).toUpperCase() + method.substring(1); - browserContext.withLogging("Clock." + method, - () -> browserContext.sendMessage("clock" + capitalizedMethod, params)); + browserContext.sendMessage("clock" + capitalizedMethod, params); } @Override diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/DialogImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/DialogImpl.java index b4e6b4241..042e13d62 100644 --- a/playwright/src/main/java/com/microsoft/playwright/impl/DialogImpl.java +++ b/playwright/src/main/java/com/microsoft/playwright/impl/DialogImpl.java @@ -34,18 +34,16 @@ class DialogImpl extends ChannelOwner implements Dialog { @Override public void accept(String promptText) { - withLogging("Dialog.accept", () -> { - JsonObject params = new JsonObject(); - if (promptText != null) { - params.addProperty("promptText", promptText); - } - sendMessage("accept", params); - }); + JsonObject params = new JsonObject(); + if (promptText != null) { + params.addProperty("promptText", promptText); + } + sendMessage("accept", params); } @Override public void dismiss() { - withLogging("Dialog.dismiss", () -> sendMessage("dismiss")); + sendMessage("dismiss"); } @Override diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/DownloadImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/DownloadImpl.java index 5ffa4e895..ed6ae1810 100644 --- a/playwright/src/main/java/com/microsoft/playwright/impl/DownloadImpl.java +++ b/playwright/src/main/java/com/microsoft/playwright/impl/DownloadImpl.java @@ -46,22 +46,22 @@ public String suggestedFilename() { @Override public void cancel() { - page.withLogging("Download.cancel", () -> artifact.cancel()); + artifact.cancel(); } @Override public InputStream createReadStream() { - return page.withLogging("Download.createReadStream", () -> artifact.createReadStream()); + return artifact.createReadStream(); } @Override public void delete() { - page.withLogging("Download.delete", () -> artifact.delete()); + artifact.delete(); } @Override public String failure() { - return page.withLogging("Download.failure", () -> artifact.failure()); + return artifact.failure(); } @Override @@ -71,11 +71,11 @@ public Page page() { @Override public Path path() { - return page.withLogging("Download.path", () -> artifact.pathAfterFinished()); + return artifact.pathAfterFinished(); } @Override public void saveAs(Path path) { - page.withLogging("Download.saveAs", () -> artifact.saveAs(path)); + artifact.saveAs(path); } } diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/ElementHandleImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/ElementHandleImpl.java index 0736a4935..0914a97d4 100644 --- a/playwright/src/main/java/com/microsoft/playwright/impl/ElementHandleImpl.java +++ b/playwright/src/main/java/com/microsoft/playwright/impl/ElementHandleImpl.java @@ -54,76 +54,66 @@ public ElementHandle asElement() { @Override public ElementHandle querySelector(String selector) { - return withLogging("ElementHandle.querySelector", () -> { - JsonObject params = new JsonObject(); - params.addProperty("selector", selector); - JsonElement json = sendMessage("querySelector", params); - JsonObject element = json.getAsJsonObject().getAsJsonObject("element"); - if (element == null) { - return null; - } - return connection.getExistingObject(element.get("guid").getAsString()); - }); + JsonObject params = new JsonObject(); + params.addProperty("selector", selector); + JsonElement json = sendMessage("querySelector", params); + JsonObject element = json.getAsJsonObject().getAsJsonObject("element"); + if (element == null) { + return null; + } + return connection.getExistingObject(element.get("guid").getAsString()); } @Override public List querySelectorAll(String selector) { - return withLogging("ElementHandle.<", () -> { - JsonObject params = new JsonObject(); - params.addProperty("selector", selector); - JsonElement json = sendMessage("querySelectorAll", params); - JsonArray elements = json.getAsJsonObject().getAsJsonArray("elements"); - if (elements == null) { - return null; - } - List handles = new ArrayList<>(); - for (JsonElement item : elements) { - handles.add(connection.getExistingObject(item.getAsJsonObject().get("guid").getAsString())); - } - return handles; - }); + JsonObject params = new JsonObject(); + params.addProperty("selector", selector); + JsonElement json = sendMessage("querySelectorAll", params); + JsonArray elements = json.getAsJsonObject().getAsJsonArray("elements"); + if (elements == null) { + return null; + } + List handles = new ArrayList<>(); + for (JsonElement item : elements) { + handles.add(connection.getExistingObject(item.getAsJsonObject().get("guid").getAsString())); + } + return handles; } @Override public Object evalOnSelector(String selector, String pageFunction, Object arg) { - return withLogging("ElementHandle.evalOnSelector", () -> { - JsonObject params = new JsonObject(); - params.addProperty("selector", selector); - params.addProperty("expression", pageFunction); - params.add("arg", gson().toJsonTree(serializeArgument(arg))); - JsonElement json = sendMessage("evalOnSelector", params); - SerializedValue value = gson().fromJson(json.getAsJsonObject().get("value"), SerializedValue.class); - return deserialize(value); - }); + JsonObject params = new JsonObject(); + params.addProperty("selector", selector); + params.addProperty("expression", pageFunction); + params.add("arg", gson().toJsonTree(serializeArgument(arg))); + JsonElement json = sendMessage("evalOnSelector", params); + SerializedValue value = gson().fromJson(json.getAsJsonObject().get("value"), SerializedValue.class); + return deserialize(value); } @Override public Object evalOnSelectorAll(String selector, String pageFunction, Object arg) { - return withLogging("ElementHandle.evalOnSelectorAll", () -> { - JsonObject params = new JsonObject(); - params.addProperty("selector", selector); - params.addProperty("expression", pageFunction); - params.add("arg", gson().toJsonTree(serializeArgument(arg))); - JsonElement json = sendMessage("evalOnSelectorAll", params); - SerializedValue value = gson().fromJson(json.getAsJsonObject().get("value"), SerializedValue.class); - return deserialize(value); - }); + JsonObject params = new JsonObject(); + params.addProperty("selector", selector); + params.addProperty("expression", pageFunction); + params.add("arg", gson().toJsonTree(serializeArgument(arg))); + JsonElement json = sendMessage("evalOnSelectorAll", params); + SerializedValue value = gson().fromJson(json.getAsJsonObject().get("value"), SerializedValue.class); + return deserialize(value); } @Override public BoundingBox boundingBox() { - return withLogging("ElementHandle.boundingBox", () -> { - JsonObject json = sendMessage("boundingBox").getAsJsonObject(); - if (!json.has("value")) { - return null; - } - return gson().fromJson(json.get("value"), BoundingBox.class); - }); + JsonObject json = sendMessage("boundingBox").getAsJsonObject(); + if (!json.has("value")) { + return null; + } + return gson().fromJson(json.get("value"), BoundingBox.class); } @Override public void check(CheckOptions options) { - withLogging("ElementHandle.check", () -> checkImpl(options)); + checkImpl(options); } private void checkImpl(CheckOptions options) { @@ -137,7 +127,7 @@ private void checkImpl(CheckOptions options) { @Override public void click(ClickOptions options) { - withLogging("ElementHandle.click", () -> clickImpl(options)); + clickImpl(options); } private void clickImpl(ClickOptions options) { @@ -151,7 +141,7 @@ private void clickImpl(ClickOptions options) { @Override public Frame contentFrame() { - return withLogging("ElementHandle.contentFrame", () -> contentFrameImpl()); + return contentFrameImpl(); } private Frame contentFrameImpl() { @@ -164,7 +154,7 @@ private Frame contentFrameImpl() { @Override public void dblclick(DblclickOptions options) { - withLogging("ElementHandle.dblclick", () -> dblclickImpl(options)); + dblclickImpl(options); } private void dblclickImpl(DblclickOptions options) { @@ -178,17 +168,15 @@ private void dblclickImpl(DblclickOptions options) { @Override public void dispatchEvent(String type, Object eventInit) { - withLogging("ElementHandle.dispatchEvent", () -> { - JsonObject params = new JsonObject(); - params.addProperty("type", type); - params.add("eventInit", gson().toJsonTree(serializeArgument(eventInit))); - sendMessage("dispatchEvent", params); - }); + JsonObject params = new JsonObject(); + params.addProperty("type", type); + params.add("eventInit", gson().toJsonTree(serializeArgument(eventInit))); + sendMessage("dispatchEvent", params); } @Override public void fill(String value, FillOptions options) { - withLogging("ElementHandle.fill", () -> fillImpl(value, options)); + fillImpl(value, options); } private void fillImpl(String value, FillOptions options) { @@ -203,22 +191,20 @@ private void fillImpl(String value, FillOptions options) { @Override public void focus() { - withLogging("ElementHandle.focus", () -> sendMessage("focus")); + sendMessage("focus"); } @Override public String getAttribute(String name) { - return withLogging("ElementHandle.getAttribute", () -> { - JsonObject params = new JsonObject(); - params.addProperty("name", name); - JsonObject json = sendMessage("getAttribute", params).getAsJsonObject(); - return json.has("value") ? json.get("value").getAsString() : null; - }); + JsonObject params = new JsonObject(); + params.addProperty("name", name); + JsonObject json = sendMessage("getAttribute", params).getAsJsonObject(); + return json.has("value") ? json.get("value").getAsString() : null; } @Override public void hover(HoverOptions options) { - withLogging("ElementHandle.hover", () -> hoverImpl(options)); + hoverImpl(options); } private void hoverImpl(HoverOptions options) { @@ -232,23 +218,19 @@ private void hoverImpl(HoverOptions options) { @Override public String innerHTML() { - return withLogging("ElementHandle.innerHTML", () -> { - JsonObject json = sendMessage("innerHTML").getAsJsonObject(); - return json.get("value").getAsString(); - }); + JsonObject json = sendMessage("innerHTML").getAsJsonObject(); + return json.get("value").getAsString(); } @Override public String innerText() { - return withLogging("ElementHandle.innerText", () -> { - JsonObject json = sendMessage("innerText").getAsJsonObject(); - return json.get("value").getAsString(); - }); + JsonObject json = sendMessage("innerText").getAsJsonObject(); + return json.get("value").getAsString(); } @Override public String inputValue(InputValueOptions options) { - return withLogging("ElementHandle.inputValue", () -> inputValueImpl(options)); + return inputValueImpl(options); } private String inputValueImpl(InputValueOptions options) { @@ -262,66 +244,52 @@ private String inputValueImpl(InputValueOptions options) { @Override public boolean isChecked() { - return withLogging("ElementHandle.isChecked", () -> { - JsonObject json = sendMessage("isChecked").getAsJsonObject(); - return json.get("value").getAsBoolean(); - }); + JsonObject json = sendMessage("isChecked").getAsJsonObject(); + return json.get("value").getAsBoolean(); } @Override public boolean isDisabled() { - return withLogging("ElementHandle.isDisabled", () -> { - JsonObject json = sendMessage("isDisabled").getAsJsonObject(); - return json.get("value").getAsBoolean(); - }); + JsonObject json = sendMessage("isDisabled").getAsJsonObject(); + return json.get("value").getAsBoolean(); } @Override public boolean isEditable() { - return withLogging("ElementHandle.isEditable", () -> { - JsonObject json = sendMessage("isEditable").getAsJsonObject(); - return json.get("value").getAsBoolean(); - }); + JsonObject json = sendMessage("isEditable").getAsJsonObject(); + return json.get("value").getAsBoolean(); } @Override public boolean isEnabled() { - return withLogging("ElementHandle.isEnabled", () -> { - JsonObject json = sendMessage("isEnabled").getAsJsonObject(); - return json.get("value").getAsBoolean(); - }); + JsonObject json = sendMessage("isEnabled").getAsJsonObject(); + return json.get("value").getAsBoolean(); } @Override public boolean isHidden() { - return withLogging("ElementHandle.isHidden", () -> { - JsonObject json = sendMessage("isHidden").getAsJsonObject(); - return json.get("value").getAsBoolean(); - }); + JsonObject json = sendMessage("isHidden").getAsJsonObject(); + return json.get("value").getAsBoolean(); } @Override public boolean isVisible() { - return withLogging("ElementHandle.isVisible", () -> { - JsonObject json = sendMessage("isVisible").getAsJsonObject(); - return json.get("value").getAsBoolean(); - }); + JsonObject json = sendMessage("isVisible").getAsJsonObject(); + return json.get("value").getAsBoolean(); } @Override public FrameImpl ownerFrame() { - return withLogging("ElementHandle.ownerFrame", () -> { - JsonObject json = sendMessage("ownerFrame").getAsJsonObject(); - if (!json.has("frame")) { - return null; - } - return connection.getExistingObject(json.getAsJsonObject("frame").get("guid").getAsString()); - }); + JsonObject json = sendMessage("ownerFrame").getAsJsonObject(); + if (!json.has("frame")) { + return null; + } + return connection.getExistingObject(json.getAsJsonObject("frame").get("guid").getAsString()); } @Override public void press(String key, PressOptions options) { - withLogging("ElementHandle.press", () -> pressImpl(key, options)); + pressImpl(key, options); } private void pressImpl(String key, PressOptions options) { if (options == null) { @@ -335,7 +303,7 @@ private void pressImpl(String key, PressOptions options) { @Override public byte[] screenshot(ScreenshotOptions options) { - return withLogging("ElementHandle.screenshot", () -> screenshotImpl(options)); + return screenshotImpl(options); } private byte[] screenshotImpl(ScreenshotOptions options) { @@ -369,7 +337,7 @@ private byte[] screenshotImpl(ScreenshotOptions options) { @Override public void scrollIntoViewIfNeeded(ScrollIntoViewIfNeededOptions options) { - withLogging("ElementHandle.scrollIntoViewIfNeeded", () -> scrollIntoViewIfNeededImpl(options)); + scrollIntoViewIfNeededImpl(options); } @Override @@ -437,15 +405,13 @@ public List selectOption(ElementHandle[] values, SelectOptionOptions opt } private List selectOption(JsonObject params) { - return withLogging("SelectOption", () -> { - JsonObject json = sendMessage("selectOption", params).getAsJsonObject(); - return parseStringList(json.getAsJsonArray("values")); - }); + JsonObject json = sendMessage("selectOption", params).getAsJsonObject(); + return parseStringList(json.getAsJsonArray("values")); } @Override public void selectText(SelectTextOptions options) { - withLogging("ElementHandle.selectText", () -> selectTextImpl(options)); + selectTextImpl(options); } @Override @@ -473,7 +439,7 @@ private void selectTextImpl(SelectTextOptions options) { @Override public void setInputFiles(Path[] files, SetInputFilesOptions options) { - withLogging("ElementHandle.setInputFiles", () -> setInputFilesImpl(files, options)); + setInputFilesImpl(files, options); } void setInputFilesImpl(Path[] files, SetInputFilesOptions options) { @@ -497,7 +463,7 @@ public void setInputFiles(FilePayload files, SetInputFilesOptions options) { @Override public void setInputFiles(FilePayload[] files, SetInputFilesOptions options) { - withLogging("ElementHandle.setInputFiles", () -> setInputFilesImpl(files, options)); + setInputFilesImpl(files, options); } void setInputFilesImpl(FilePayload[] files, SetInputFilesOptions options) { @@ -513,7 +479,7 @@ void setInputFilesImpl(FilePayload[] files, SetInputFilesOptions options) { @Override public void tap(TapOptions options) { - withLogging("ElementHandle.tap", () -> tapImpl(options)); + tapImpl(options); } private void tapImpl(TapOptions options) { @@ -527,19 +493,17 @@ private void tapImpl(TapOptions options) { @Override public String textContent() { - return withLogging("ElementHandle.textContent", () -> textContentImpl()); + return textContentImpl(); } private String textContentImpl() { - return withLogging("ElementHandle.textContent", () -> { - JsonObject json = sendMessage("textContent").getAsJsonObject(); - return json.has("value") ? json.get("value").getAsString() : null; - }); + JsonObject json = sendMessage("textContent").getAsJsonObject(); + return json.has("value") ? json.get("value").getAsString() : null; } @Override public void type(String text, TypeOptions options) { - withLogging("ElementHandle.type", () -> typeImpl(text, options)); + typeImpl(text, options); } private void typeImpl(String text, TypeOptions options) { @@ -554,7 +518,7 @@ private void typeImpl(String text, TypeOptions options) { @Override public void uncheck(UncheckOptions options) { - withLogging("ElementHandle.uncheck", () -> uncheckImpl(options)); + uncheckImpl(options); } private void uncheckImpl(UncheckOptions options) { @@ -568,7 +532,7 @@ private void uncheckImpl(UncheckOptions options) { @Override public void waitForElementState(ElementState state, WaitForElementStateOptions options) { - withLogging("ElementHandle.waitForElementState", () -> waitForElementStateImpl(state, options)); + waitForElementStateImpl(state, options); } private void waitForElementStateImpl(ElementState state, WaitForElementStateOptions options) { @@ -590,7 +554,7 @@ private static String toProtocol(ElementState state) { @Override public ElementHandle waitForSelector(String selector, WaitForSelectorOptions options) { - return withLogging("ElementHandle.waitForSelector", () -> waitForSelectorImpl(selector, options)); + return waitForSelectorImpl(selector, options); } private ElementHandle waitForSelectorImpl(String selector, WaitForSelectorOptions options) { diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/FileChooserImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/FileChooserImpl.java index ddfb66ea1..4a8944e1a 100644 --- a/playwright/src/main/java/com/microsoft/playwright/impl/FileChooserImpl.java +++ b/playwright/src/main/java/com/microsoft/playwright/impl/FileChooserImpl.java @@ -58,8 +58,7 @@ public void setFiles(Path files, SetFilesOptions options) { @Override public void setFiles(Path[] files, SetFilesOptions options) { - page.withLogging("FileChooser.setInputFiles", - () -> element.setInputFilesImpl(files, convertType(options, ElementHandle.SetInputFilesOptions.class))); + element.setInputFilesImpl(files, convertType(options, ElementHandle.SetInputFilesOptions.class)); } @Override @@ -69,7 +68,6 @@ public void setFiles(FilePayload files, SetFilesOptions options) { @Override public void setFiles(FilePayload[] files, SetFilesOptions options) { - page.withLogging("FileChooser.setInputFiles", - () -> element.setInputFilesImpl(files, convertType(options, ElementHandle.SetInputFilesOptions.class))); + element.setInputFilesImpl(files, convertType(options, ElementHandle.SetInputFilesOptions.class)); } } diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/FrameImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/FrameImpl.java index e798fda7c..22dab38ea 100644 --- a/playwright/src/main/java/com/microsoft/playwright/impl/FrameImpl.java +++ b/playwright/src/main/java/com/microsoft/playwright/impl/FrameImpl.java @@ -74,7 +74,7 @@ private static WaitUntilState loadStateFromProtocol(String value) { @Override public ElementHandle querySelector(String selector, QuerySelectorOptions options) { - return withLogging("Frame.querySelector", () -> querySelectorImpl(selector, options)); + return querySelectorImpl(selector, options); } ElementHandleImpl querySelectorImpl(String selector, QuerySelectorOptions options) { @@ -93,7 +93,7 @@ ElementHandleImpl querySelectorImpl(String selector, QuerySelectorOptions option @Override public List querySelectorAll(String selector) { - return withLogging("Frame.querySelectorAll", () -> querySelectorAllImpl(selector)); + return querySelectorAllImpl(selector); } @Override @@ -110,7 +110,7 @@ public List selectOption(String selector, ElementHandle value, SelectOpt @Override public List selectOption(String selector, String[] values, SelectOptionOptions options) { - return withLogging("Frame.selectOption", () -> selectOptionImpl(selector, values, options)); + return selectOptionImpl(selector, values, options); } @Override @@ -136,7 +136,7 @@ List querySelectorAllImpl(String selector) { @Override public Object evalOnSelector(String selector, String pageFunction, Object arg, EvalOnSelectorOptions options) { - return withLogging("Frame.evalOnSelector", () -> evalOnSelectorImpl(selector, pageFunction, arg, options)); + return evalOnSelectorImpl(selector, pageFunction, arg, options); } Object evalOnSelectorImpl(String selector, String pageFunction, Object arg, EvalOnSelectorOptions options) { @@ -154,7 +154,7 @@ Object evalOnSelectorImpl(String selector, String pageFunction, Object arg, Eval @Override public Object evalOnSelectorAll(String selector, String pageFunction, Object arg) { - return withLogging("Frame.evalOnSelectorAll", () -> evalOnSelectorAllImpl(selector, pageFunction, arg)); + return evalOnSelectorAllImpl(selector, pageFunction, arg); } Object evalOnSelectorAllImpl(String selector, String pageFunction, Object arg) { @@ -169,7 +169,7 @@ Object evalOnSelectorAllImpl(String selector, String pageFunction, Object arg) { @Override public ElementHandle addScriptTag(AddScriptTagOptions options){ - return withLogging("Frame.addScriptTag", () -> addScriptTagImpl(options)); + return addScriptTagImpl(options); } ElementHandle addScriptTagImpl(AddScriptTagOptions options) { @@ -195,7 +195,7 @@ ElementHandle addScriptTagImpl(AddScriptTagOptions options) { @Override public ElementHandle addStyleTag(AddStyleTagOptions options){ - return withLogging("Frame.addStyleTag", () -> addStyleTagImpl(options)); + return addStyleTagImpl(options); } ElementHandle addStyleTagImpl(AddStyleTagOptions options) { @@ -221,7 +221,7 @@ ElementHandle addStyleTagImpl(AddStyleTagOptions options) { @Override public void check(String selector, CheckOptions options){ - withLogging("Frame.check", () -> checkImpl(selector, options)); + checkImpl(selector, options); } void checkImpl(String selector, CheckOptions options) { @@ -241,7 +241,7 @@ public List childFrames() { @Override public void click(String selector, ClickOptions options) { - withLogging("Frame.click", () -> clickImpl(selector, options)); + clickImpl(selector, options); } void clickImpl(String selector, ClickOptions options) { @@ -256,7 +256,7 @@ void clickImpl(String selector, ClickOptions options) { @Override public String content() { - return withLogging("Frame.content", () -> contentImpl()); + return contentImpl(); } String contentImpl() { @@ -265,7 +265,7 @@ String contentImpl() { @Override public void dblclick(String selector, DblclickOptions options) { - withLogging("Frame.dblclick", () -> dblclickImpl(selector, options)); + dblclickImpl(selector, options); } void dblclickImpl(String selector, DblclickOptions options) { @@ -280,7 +280,7 @@ void dblclickImpl(String selector, DblclickOptions options) { @Override public void dispatchEvent(String selector, String type, Object eventInit, DispatchEventOptions options) { - withLogging("Frame.dispatchEvent", () -> dispatchEventImpl(selector, type, eventInit, options)); + dispatchEventImpl(selector, type, eventInit, options); } void dispatchEventImpl(String selector, String type, Object eventInit, DispatchEventOptions options) { @@ -297,7 +297,7 @@ void dispatchEventImpl(String selector, String type, Object eventInit, DispatchE @Override public Object evaluate(String expression, Object arg) { - return withLogging("Frame.evaluate", () -> evaluateImpl(expression, arg)); + return evaluateImpl(expression, arg); } Object evaluateImpl(String expression, Object arg) { @@ -312,7 +312,7 @@ Object evaluateImpl(String expression, Object arg) { @Override public JSHandle evaluateHandle(String pageFunction, Object arg) { - return withLogging("Frame.evaluateHandle", () -> evaluateHandleImpl(pageFunction, arg)); + return evaluateHandleImpl(pageFunction, arg); } JSHandle evaluateHandleImpl(String pageFunction, Object arg) { @@ -326,7 +326,7 @@ JSHandle evaluateHandleImpl(String pageFunction, Object arg) { @Override public void fill(String selector, String value, FillOptions options) { - withLogging("Frame.fill", () -> fillImpl(selector, value, options)); + fillImpl(selector, value, options); } void fillImpl(String selector, String value, FillOptions options) { @@ -342,7 +342,7 @@ void fillImpl(String selector, String value, FillOptions options) { @Override public void focus(String selector, FocusOptions options) { - withLogging("Frame.focus", () -> focusImpl(selector, options)); + focusImpl(selector, options); } void focusImpl(String selector, FocusOptions options) { @@ -357,7 +357,7 @@ void focusImpl(String selector, FocusOptions options) { @Override public ElementHandle frameElement() { - return withLogging("Frame.frameElement", () -> frameElementImpl()); + return frameElementImpl(); } @@ -373,7 +373,7 @@ ElementHandle frameElementImpl() { @Override public String getAttribute(String selector, String name, GetAttributeOptions options) { - return withLogging("Frame.getAttribute", () -> getAttributeImpl(selector, name, options)); + return getAttributeImpl(selector, name, options); } @Override @@ -458,7 +458,7 @@ String getAttributeImpl(String selector, String name, GetAttributeOptions option @Override public ResponseImpl navigate(String url, NavigateOptions options) { - return withLogging("Page.navigate", () -> navigateImpl(url, options)); + return navigateImpl(url, options); } ResponseImpl navigateImpl(String url, NavigateOptions options) { @@ -478,7 +478,7 @@ ResponseImpl navigateImpl(String url, NavigateOptions options) { @Override public void hover(String selector, HoverOptions options) { - withLogging("Frame.hover", () -> hoverImpl(selector, options)); + hoverImpl(selector, options); } void hoverImpl(String selector, HoverOptions options) { @@ -493,7 +493,7 @@ void hoverImpl(String selector, HoverOptions options) { @Override public void dragAndDrop(String source, String target, DragAndDropOptions options) { - withLogging("Frame.dragAndDrop", () -> dragAndDropImpl(source, target, options)); + dragAndDropImpl(source, target, options); } void dragAndDropImpl(String source, String target, DragAndDropOptions options) { @@ -509,7 +509,7 @@ void dragAndDropImpl(String source, String target, DragAndDropOptions options) { @Override public String innerHTML(String selector, InnerHTMLOptions options) { - return withLogging("Frame.innerHTML", () -> innerHTMLImpl(selector, options)); + return innerHTMLImpl(selector, options); } String innerHTMLImpl(String selector, InnerHTMLOptions options) { @@ -525,7 +525,7 @@ String innerHTMLImpl(String selector, InnerHTMLOptions options) { @Override public String innerText(String selector, InnerTextOptions options) { - return withLogging("Frame.innerText", () -> innerTextImpl(selector, options)); + return innerTextImpl(selector, options); } String innerTextImpl(String selector, InnerTextOptions options) { @@ -541,7 +541,7 @@ String innerTextImpl(String selector, InnerTextOptions options) { @Override public String inputValue(String selector, InputValueOptions options) { - return withLogging("Frame.inputValue", () -> inputValueImpl(selector, options)); + return inputValueImpl(selector, options); } String inputValueImpl(String selector, InputValueOptions options) { @@ -557,7 +557,7 @@ String inputValueImpl(String selector, InputValueOptions options) { @Override public boolean isChecked(String selector, IsCheckedOptions options) { - return withLogging("Page.isChecked", () -> isCheckedImpl(selector, options)); + return isCheckedImpl(selector, options); } boolean isCheckedImpl(String selector, IsCheckedOptions options) { @@ -578,7 +578,7 @@ public boolean isDetached() { @Override public boolean isDisabled(String selector, IsDisabledOptions options) { - return withLogging("Page.isDisabled", () -> isDisabledImpl(selector, options)); + return isDisabledImpl(selector, options); } boolean isDisabledImpl(String selector, IsDisabledOptions options) { @@ -594,7 +594,7 @@ boolean isDisabledImpl(String selector, IsDisabledOptions options) { @Override public boolean isEditable(String selector, IsEditableOptions options) { - return withLogging("Page.isEditable", () -> isEditableImpl(selector, options)); + return isEditableImpl(selector, options); } boolean isEditableImpl(String selector, IsEditableOptions options) { @@ -610,7 +610,7 @@ boolean isEditableImpl(String selector, IsEditableOptions options) { @Override public boolean isEnabled(String selector, IsEnabledOptions options) { - return withLogging("Page.isEnabled", () -> isEnabledImpl(selector, options)); + return isEnabledImpl(selector, options); } boolean isEnabledImpl(String selector, IsEnabledOptions options) { @@ -626,7 +626,7 @@ boolean isEnabledImpl(String selector, IsEnabledOptions options) { @Override public boolean isHidden(String selector, IsHiddenOptions options) { - return withLogging("Page.isHidden", () -> isHiddenImpl(selector, options)); + return isHiddenImpl(selector, options); } boolean isHiddenImpl(String selector, IsHiddenOptions options) { @@ -642,7 +642,7 @@ boolean isHiddenImpl(String selector, IsHiddenOptions options) { @Override public boolean isVisible(String selector, IsVisibleOptions options) { - return withLogging("Page.isVisible", () -> isVisibleImpl(selector, options)); + return isVisibleImpl(selector, options); } @Override @@ -677,7 +677,7 @@ public Frame parentFrame() { @Override public void press(String selector, String key, PressOptions options) { - withLogging("Frame.press", () -> pressImpl(selector, key, options)); + pressImpl(selector, key, options); } void pressImpl(String selector, String key, PressOptions options) { @@ -693,7 +693,7 @@ void pressImpl(String selector, String key, PressOptions options) { @Override public List selectOption(String selector, SelectOption[] values, SelectOptionOptions options) { - return withLogging("Frame.selectOption", () -> selectOptionImpl(selector, values, options)); + return selectOptionImpl(selector, values, options); } List selectOptionImpl(String selector, SelectOption[] values, SelectOptionOptions options) { @@ -724,7 +724,7 @@ List selectOptionImpl(String selector, String[] values, SelectOptionOpti @Override public List selectOption(String selector, ElementHandle[] values, SelectOptionOptions options) { - return withLogging("Frame.selectOption", () -> selectOptionImpl(selector, values, options)); + return selectOptionImpl(selector, values, options); } List selectOptionImpl(String selector, ElementHandle[] values, SelectOptionOptions options) { @@ -747,7 +747,7 @@ private List selectOption(JsonObject params) { @Override public void setChecked(String selector, boolean checked, SetCheckedOptions options) { - withLogging("Frame.setChecked", () -> setCheckedImpl(selector, checked, options)); + setCheckedImpl(selector, checked, options); } void setCheckedImpl(String selector, boolean checked, SetCheckedOptions options) { @@ -760,7 +760,7 @@ void setCheckedImpl(String selector, boolean checked, SetCheckedOptions options) @Override public void setContent(String html, SetContentOptions options) { - withLogging("Frame.setContent", () -> setContentImpl(html, options)); + setContentImpl(html, options); } @Override @@ -780,7 +780,7 @@ void setContentImpl(String html, SetContentOptions options) { @Override public void setInputFiles(String selector, Path[] files, SetInputFilesOptions options) { - withLogging("Frame.setInputFiles", () -> setInputFilesImpl(selector, files, options)); + setInputFilesImpl(selector, files, options); } void setInputFilesImpl(String selector, Path[] files, SetInputFilesOptions options) { @@ -801,7 +801,7 @@ public void setInputFiles(String selector, FilePayload files, SetInputFilesOptio @Override public void setInputFiles(String selector, FilePayload[] files, SetInputFilesOptions options) { - withLogging("Frame.setInputFiles", () -> setInputFilesImpl(selector, files, options)); + setInputFilesImpl(selector, files, options); } void setInputFilesImpl(String selector, FilePayload[] files, SetInputFilesOptions options) { @@ -818,7 +818,7 @@ void setInputFilesImpl(String selector, FilePayload[] files, SetInputFilesOption @Override public void tap(String selector, TapOptions options) { - withLogging("Frame.tap", () -> tapImpl(selector, options)); + tapImpl(selector, options); } void tapImpl(String selector, TapOptions options) { if (options == null) { @@ -832,7 +832,7 @@ void tapImpl(String selector, TapOptions options) { @Override public String textContent(String selector, TextContentOptions options) { - return withLogging("Frame.textContent", () -> textContentImpl(selector, options)); + return textContentImpl(selector, options); } String textContentImpl(String selector, TextContentOptions options) { @@ -847,7 +847,7 @@ String textContentImpl(String selector, TextContentOptions options) { @Override public String title() { - return withLogging("Frame.title", () -> titleImpl()); + return titleImpl(); } String titleImpl() { @@ -857,7 +857,7 @@ String titleImpl() { @Override public void type(String selector, String text, TypeOptions options) { - withLogging("Frame.type", () -> typeImpl(selector, text, options)); + typeImpl(selector, text, options); } void typeImpl(String selector, String text, TypeOptions options) { @@ -873,7 +873,7 @@ void typeImpl(String selector, String text, TypeOptions options) { @Override public void uncheck(String selector, UncheckOptions options) { - withLogging("Frame.uncheck", () -> uncheckImpl(selector, options)); + uncheckImpl(selector, options); } void uncheckImpl(String selector, UncheckOptions options) { @@ -893,7 +893,7 @@ public String url() { @Override public JSHandle waitForFunction(String pageFunction, Object arg, WaitForFunctionOptions options) { - return withLogging("Frame.waitForFunction", () -> waitForFunctionImpl(pageFunction, arg, options)); + return waitForFunctionImpl(pageFunction, arg, options); } JSHandle waitForFunctionImpl(String pageFunction, Object arg, WaitForFunctionOptions options) { @@ -1073,7 +1073,7 @@ private Response waitForNavigationImpl(Logger logger, Runnable code, WaitForNavi @Override public ElementHandle waitForSelector(String selector, WaitForSelectorOptions options) { - return withLogging("Frame.waitForSelector", () -> waitForSelectorImpl(selector, options)); + return waitForSelectorImpl(selector, options); } ElementHandle waitForSelectorImpl(String selector, WaitForSelectorOptions options) { @@ -1098,7 +1098,7 @@ ElementHandle waitForSelectorImpl(String selector, WaitForSelectorOptions option @Override public void waitForTimeout(double timeout) { - withLogging("Frame.waitForTimeout", () -> waitForTimeoutImpl(timeout)); + waitForTimeoutImpl(timeout); } void waitForTimeoutImpl(double timeout) { diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/JSHandleImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/JSHandleImpl.java index 4adc81702..2c6df073b 100644 --- a/playwright/src/main/java/com/microsoft/playwright/impl/JSHandleImpl.java +++ b/playwright/src/main/java/com/microsoft/playwright/impl/JSHandleImpl.java @@ -41,70 +41,58 @@ public ElementHandle asElement() { @Override public void dispose() { - withLogging("JSHandle.dispose", () -> { - try { - sendMessage("dispose"); - } catch (TargetClosedError e) { - } - }); + try { + sendMessage("dispose"); + } catch (TargetClosedError e) { + } } @Override public Object evaluate(String pageFunction, Object arg) { - return withLogging("JSHandle.evaluate", () -> { - JsonObject params = new JsonObject(); - params.addProperty("expression", pageFunction); - params.addProperty("world", "main"); - params.add("arg", gson().toJsonTree(serializeArgument(arg))); - JsonElement json = sendMessage("evaluateExpression", params); - SerializedValue value = gson().fromJson(json.getAsJsonObject().get("value"), SerializedValue.class); - return deserialize(value); - }); + JsonObject params = new JsonObject(); + params.addProperty("expression", pageFunction); + params.addProperty("world", "main"); + params.add("arg", gson().toJsonTree(serializeArgument(arg))); + JsonElement json = sendMessage("evaluateExpression", params); + SerializedValue value = gson().fromJson(json.getAsJsonObject().get("value"), SerializedValue.class); + return deserialize(value); } @Override public JSHandle evaluateHandle(String pageFunction, Object arg) { - return withLogging("JSHandle.evaluateHandle", () -> { - JsonObject params = new JsonObject(); - params.addProperty("expression", pageFunction); - params.addProperty("world", "main"); - params.add("arg", gson().toJsonTree(serializeArgument(arg))); - JsonElement json = sendMessage("evaluateExpressionHandle", params); - return connection.getExistingObject(json.getAsJsonObject().getAsJsonObject("handle").get("guid").getAsString()); - }); + JsonObject params = new JsonObject(); + params.addProperty("expression", pageFunction); + params.addProperty("world", "main"); + params.add("arg", gson().toJsonTree(serializeArgument(arg))); + JsonElement json = sendMessage("evaluateExpressionHandle", params); + return connection.getExistingObject(json.getAsJsonObject().getAsJsonObject("handle").get("guid").getAsString()); } @Override public Map getProperties() { - return withLogging("JSHandle.getProperties", () -> { - JsonObject json = sendMessage("getPropertyList").getAsJsonObject(); - Map result = new HashMap<>(); - for (JsonElement e : json.getAsJsonArray("properties")) { - JsonObject item = e.getAsJsonObject(); - JSHandle value = connection.getExistingObject(item.getAsJsonObject("value").get("guid").getAsString()); - result.put(item.get("name").getAsString(), value); - } - return result; - }); + JsonObject json = sendMessage("getPropertyList").getAsJsonObject(); + Map result = new HashMap<>(); + for (JsonElement e : json.getAsJsonArray("properties")) { + JsonObject item = e.getAsJsonObject(); + JSHandle value = connection.getExistingObject(item.getAsJsonObject("value").get("guid").getAsString()); + result.put(item.get("name").getAsString(), value); + } + return result; } @Override public JSHandle getProperty(String propertyName) { - return withLogging("JSHandle.getProperty", () -> { - JsonObject params = new JsonObject(); - params.addProperty("name", propertyName); - JsonObject json = sendMessage("getProperty", params).getAsJsonObject(); - return connection.getExistingObject(json.getAsJsonObject("handle").get("guid").getAsString()); - }); + JsonObject params = new JsonObject(); + params.addProperty("name", propertyName); + JsonObject json = sendMessage("getProperty", params).getAsJsonObject(); + return connection.getExistingObject(json.getAsJsonObject("handle").get("guid").getAsString()); } @Override public Object jsonValue() { - return withLogging("JSHandle.jsonValue", () -> { - JsonObject json = sendMessage("jsonValue").getAsJsonObject(); - SerializedValue value = gson().fromJson(json.get("value"), SerializedValue.class); - return deserialize(value); - }); + JsonObject json = sendMessage("jsonValue").getAsJsonObject(); + SerializedValue value = gson().fromJson(json.get("value"), SerializedValue.class); + return deserialize(value); } @Override diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/KeyboardImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/KeyboardImpl.java index e6915d775..a6f922573 100644 --- a/playwright/src/main/java/com/microsoft/playwright/impl/KeyboardImpl.java +++ b/playwright/src/main/java/com/microsoft/playwright/impl/KeyboardImpl.java @@ -30,25 +30,21 @@ class KeyboardImpl implements Keyboard { @Override public void down(String key) { - page.withLogging("Keyboard.down", () -> { - JsonObject params = new JsonObject(); - params.addProperty("key", key); - page.sendMessage("keyboardDown", params); - }); + JsonObject params = new JsonObject(); + params.addProperty("key", key); + page.sendMessage("keyboardDown", params); } @Override public void insertText(String text) { - page.withLogging("Keyboard.insertText", () -> { - JsonObject params = new JsonObject(); - params.addProperty("text", text); - page.sendMessage("keyboardInsertText", params); - }); + JsonObject params = new JsonObject(); + params.addProperty("text", text); + page.sendMessage("keyboardInsertText", params); } @Override public void press(String key, PressOptions options) { - page.withLogging("Keyboard.press", () -> pressImpl(key, options)); + pressImpl(key, options); } private void pressImpl(String key, PressOptions options) { @@ -62,7 +58,7 @@ private void pressImpl(String key, PressOptions options) { @Override public void type(String text, TypeOptions options) { - page.withLogging("Keyboard.type", () -> typeImpl(text, options)); + typeImpl(text, options); } private void typeImpl(String text, TypeOptions options) { @@ -76,10 +72,8 @@ private void typeImpl(String text, TypeOptions options) { @Override public void up(String key) { - page.withLogging("Keyboard.up", () -> { - JsonObject params = new JsonObject(); - params.addProperty("key", key); - page.sendMessage("keyboardUp", params); - }); + JsonObject params = new JsonObject(); + params.addProperty("key", key); + page.sendMessage("keyboardUp", params); } } diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/LocatorImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/LocatorImpl.java index 33bddbdb5..fb8563d62 100644 --- a/playwright/src/main/java/com/microsoft/playwright/impl/LocatorImpl.java +++ b/playwright/src/main/java/com/microsoft/playwright/impl/LocatorImpl.java @@ -118,7 +118,7 @@ public Locator and(Locator locator) { @Override public String ariaSnapshot(AriaSnapshotOptions options) { - return frame.withLogging("Locator.ariaSnapshot", () -> ariaSnapshotImpl(options)); + return ariaSnapshotImpl(options); } private String ariaSnapshotImpl(AriaSnapshotOptions options) { @@ -134,7 +134,7 @@ private String ariaSnapshotImpl(AriaSnapshotOptions options) { @Override public void blur(BlurOptions options) { - frame.withLogging("Locator.blur", () -> blurImpl(options)); + blurImpl(options); } private void blurImpl(BlurOptions options) { @@ -636,7 +636,7 @@ public void waitFor(WaitForOptions options) { } private void waitForImpl(WaitForOptions options) { - frame.withLogging("Locator.waitFor", () -> frame.waitForSelectorImpl(selector, convertType(options, Frame.WaitForSelectorOptions.class).setStrict(true), true)); + frame.waitForSelectorImpl(selector, convertType(options, Frame.WaitForSelectorOptions.class).setStrict(true), true); } @Override diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/LoggingSupport.java b/playwright/src/main/java/com/microsoft/playwright/impl/LoggingSupport.java index 954e239a6..b0e5cc170 100644 --- a/playwright/src/main/java/com/microsoft/playwright/impl/LoggingSupport.java +++ b/playwright/src/main/java/com/microsoft/playwright/impl/LoggingSupport.java @@ -19,7 +19,6 @@ import java.time.ZoneId; import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; -import java.util.function.Supplier; class LoggingSupport { private static final boolean isEnabled; @@ -31,29 +30,6 @@ class LoggingSupport { private static final DateTimeFormatter timestampFormat = DateTimeFormatter.ofPattern( "yyyy-MM-dd'T'HH:mm:ss.SSSXXX").withZone(ZoneId.of("UTC")); - void withLogging(String apiName, Runnable code) { - withLogging(apiName, () -> { - code.run(); - return null; - }); - } - - T withLogging(String apiName, Supplier code) { - if (isEnabled) { - logApi("=> " + apiName + " started"); - } - boolean success = false; - try { - T result = code.get(); - success = true; - return result; - } finally { - if (isEnabled) { - logApi("<= " + apiName + (success ? " succeeded" : " failed")); - } - } - } - static void logWithTimestamp(String message) { // This matches log format produced by the server. String timestamp = ZonedDateTime.now().format(timestampFormat); diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/MouseImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/MouseImpl.java index 7b0b55b98..2f6e6c267 100644 --- a/playwright/src/main/java/com/microsoft/playwright/impl/MouseImpl.java +++ b/playwright/src/main/java/com/microsoft/playwright/impl/MouseImpl.java @@ -31,7 +31,7 @@ class MouseImpl implements Mouse { @Override public void click(double x, double y, ClickOptions options) { - page.withLogging("Mouse.click", () -> clickImpl(x, y, options)); + clickImpl(x, y, options); } private void clickImpl(double x, double y, ClickOptions options) { @@ -62,7 +62,7 @@ private void dblclickImpl(double x, double y, DblclickOptions options) { @Override public void down(DownOptions options) { - page.withLogging("Mouse.down", () -> downImpl(options)); + downImpl(options); } private void downImpl(DownOptions options) { @@ -75,7 +75,7 @@ private void downImpl(DownOptions options) { @Override public void move(double x, double y, MoveOptions options) { - page.withLogging("Mouse.move", () -> moveImpl(x, y, options)); + moveImpl(x, y, options); } private void moveImpl(double x, double y, MoveOptions options) { @@ -90,17 +90,15 @@ private void moveImpl(double x, double y, MoveOptions options) { @Override public void up(UpOptions options) { - page.withLogging("Mouse.up", () -> upImpl(options)); + upImpl(options); } @Override public void wheel(double deltaX, double deltaY) { - page.withLogging("Mouse.wheel", () -> { - JsonObject params = new JsonObject(); - params.addProperty("deltaX", deltaX); - params.addProperty("deltaY", deltaY); - page.sendMessage("mouseWheel", params); - }); + JsonObject params = new JsonObject(); + params.addProperty("deltaX", deltaX); + params.addProperty("deltaY", deltaY); + page.sendMessage("mouseWheel", params); } private void upImpl(UpOptions options) { diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/PageImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/PageImpl.java index e132f9591..9baa7eaa7 100644 --- a/playwright/src/main/java/com/microsoft/playwright/impl/PageImpl.java +++ b/playwright/src/main/java/com/microsoft/playwright/impl/PageImpl.java @@ -558,13 +558,13 @@ public void close(CloseOptions options) { @Override public ElementHandle querySelector(String selector, QuerySelectorOptions options) { - return withLogging("Page.querySelector", () -> mainFrame.querySelectorImpl( - selector, convertType(options, Frame.QuerySelectorOptions.class))); + return mainFrame.querySelectorImpl( + selector, convertType(options, Frame.QuerySelectorOptions.class)); } @Override public List querySelectorAll(String selector) { - return withLogging("Page.querySelectorAll", () -> mainFrame.querySelectorAllImpl(selector)); + return mainFrame.querySelectorAllImpl(selector); } @Override @@ -580,17 +580,15 @@ public void addLocatorHandler(Locator locator, Consumer handler, AddLoc return; } AddLocatorHandlerOptions finalOptions = options; - withLogging("Page.addLocatorHandler", () -> { - JsonObject params = new JsonObject(); - params.addProperty("selector", locatorImpl.selector); - if (finalOptions.noWaitAfter != null && finalOptions.noWaitAfter) { - params.addProperty("noWaitAfter", true); - } - params.addProperty("selector", locatorImpl.selector); - JsonObject json = (JsonObject) sendMessage("registerLocatorHandler", params); - int uid = json.get("uid").getAsInt(); - locatorHandlers.put(uid, new LocatorHandler(locator, handler, finalOptions.times)); - }); + JsonObject params = new JsonObject(); + params.addProperty("selector", locatorImpl.selector); + if (finalOptions.noWaitAfter != null && finalOptions.noWaitAfter) { + params.addProperty("noWaitAfter", true); + } + params.addProperty("selector", locatorImpl.selector); + JsonObject json = (JsonObject) sendMessage("registerLocatorHandler", params); + int uid = json.get("uid").getAsInt(); + locatorHandlers.put(uid, new LocatorHandler(locator, handler, finalOptions.times)); } @Override @@ -626,31 +624,29 @@ private void onLocatorHandlerTriggered(int uid) { @Override public Object evalOnSelector(String selector, String pageFunction, Object arg, EvalOnSelectorOptions options) { - return withLogging("Page.evalOnSelector", () -> mainFrame.evalOnSelectorImpl( - selector, pageFunction, arg, convertType(options, Frame.EvalOnSelectorOptions.class))); + return mainFrame.evalOnSelectorImpl( + selector, pageFunction, arg, convertType(options, Frame.EvalOnSelectorOptions.class)); } @Override public Object evalOnSelectorAll(String selector, String pageFunction, Object arg) { - return withLogging("Page.evalOnSelectorAll", () -> mainFrame.evalOnSelectorAllImpl(selector, pageFunction, arg)); + return mainFrame.evalOnSelectorAllImpl(selector, pageFunction, arg); } @Override public void addInitScript(String script) { - withLogging("Page.addInitScript", () -> addInitScriptImpl(script)); + addInitScriptImpl(script); } @Override public void addInitScript(Path path) { - withLogging("Page.addInitScript", () -> { - try { - byte[] bytes = readAllBytes(path); - String script = addSourceUrlToScript(new String(bytes, UTF_8), path); - addInitScriptImpl(script); - } catch (IOException e) { - throw new PlaywrightException("Failed to read script from file", e); - } - }); + try { + byte[] bytes = readAllBytes(path); + String script = addSourceUrlToScript(new String(bytes, UTF_8), path); + addInitScriptImpl(script); + } catch (IOException e) { + throw new PlaywrightException("Failed to read script from file", e); + } } private void addInitScriptImpl(String script) { @@ -661,36 +657,32 @@ private void addInitScriptImpl(String script) { @Override public ElementHandle addScriptTag(AddScriptTagOptions options) { - return withLogging("Page.addScriptTag", - () -> mainFrame.addScriptTagImpl(convertType(options, Frame.AddScriptTagOptions.class))); + return mainFrame.addScriptTagImpl(convertType(options, Frame.AddScriptTagOptions.class)); } @Override public ElementHandle addStyleTag(AddStyleTagOptions options) { - return withLogging("Page.addStyleTag", - () -> mainFrame.addStyleTagImpl(convertType(options, Frame.AddStyleTagOptions.class))); + return mainFrame.addStyleTagImpl(convertType(options, Frame.AddStyleTagOptions.class)); } @Override public void bringToFront() { - withLogging("Page.bringToFront", () -> sendMessage("bringToFront")); + sendMessage("bringToFront"); } @Override public void check(String selector, CheckOptions options) { - withLogging("Page.check", - () -> mainFrame.checkImpl(selector, convertType(options, Frame.CheckOptions.class))); + mainFrame.checkImpl(selector, convertType(options, Frame.CheckOptions.class)); } @Override public void click(String selector, ClickOptions options) { - withLogging("Page.click", - () -> mainFrame.clickImpl(selector, convertType(options, Frame.ClickOptions.class))); + mainFrame.clickImpl(selector, convertType(options, Frame.ClickOptions.class)); } @Override public String content() { - return withLogging("Page.content", () -> mainFrame.contentImpl()); + return mainFrame.contentImpl(); } @Override @@ -700,19 +692,17 @@ public BrowserContextImpl context() { @Override public void dblclick(String selector, DblclickOptions options) { - withLogging("Page.dblclick", - () -> mainFrame.dblclickImpl(selector, convertType(options, Frame.DblclickOptions.class))); + mainFrame.dblclickImpl(selector, convertType(options, Frame.DblclickOptions.class)); } @Override public void dispatchEvent(String selector, String type, Object eventInit, DispatchEventOptions options) { - withLogging("Page.dispatchEvent", - () -> mainFrame.dispatchEventImpl(selector, type, eventInit, convertType(options, Frame.DispatchEventOptions.class))); + mainFrame.dispatchEventImpl(selector, type, eventInit, convertType(options, Frame.DispatchEventOptions.class)); } @Override public void emulateMedia(EmulateMediaOptions options) { - withLogging("Page.emulateMedia", () -> emulateMediaImpl(options)); + emulateMediaImpl(options); } private void emulateMediaImpl(EmulateMediaOptions options) { @@ -725,17 +715,17 @@ private void emulateMediaImpl(EmulateMediaOptions options) { @Override public Object evaluate(String expression, Object arg) { - return withLogging("Page.evaluate", () -> mainFrame.evaluateImpl(expression, arg)); + return mainFrame.evaluateImpl(expression, arg); } @Override public JSHandle evaluateHandle(String pageFunction, Object arg) { - return withLogging("Page.evaluateHandle", () -> mainFrame.evaluateHandleImpl(pageFunction, arg)); + return mainFrame.evaluateHandleImpl(pageFunction, arg); } @Override public void exposeBinding(String name, BindingCallback playwrightBinding, ExposeBindingOptions options) { - withLogging("Page.exposeBinding", () -> exposeBindingImpl(name, playwrightBinding, options)); + exposeBindingImpl(name, playwrightBinding, options); } private void exposeBindingImpl(String name, BindingCallback playwrightBinding, ExposeBindingOptions options) { @@ -757,20 +747,17 @@ private void exposeBindingImpl(String name, BindingCallback playwrightBinding, E @Override public void exposeFunction(String name, FunctionCallback playwrightFunction) { - withLogging("Page.exposeFunction", - () -> exposeBindingImpl(name, (BindingCallback.Source source, Object... args) -> playwrightFunction.call(args), null)); + exposeBindingImpl(name, (BindingCallback.Source source, Object... args) -> playwrightFunction.call(args), null); } @Override public void fill(String selector, String value, FillOptions options) { - withLogging("Page.fill", - () -> mainFrame.fillImpl(selector, value, convertType(options, Frame.FillOptions.class))); + mainFrame.fillImpl(selector, value, convertType(options, Frame.FillOptions.class)); } @Override public void focus(String selector, FocusOptions options) { - withLogging("Page.focus", - () -> mainFrame.focusImpl(selector, convertType(options, Frame.FocusOptions.class))); + mainFrame.focusImpl(selector, convertType(options, Frame.FocusOptions.class)); } @Override @@ -819,89 +806,77 @@ public List frames() { @Override public String getAttribute(String selector, String name, GetAttributeOptions options) { - return withLogging("Page.getAttribute", - () -> mainFrame.getAttributeImpl(selector, name, convertType(options, Frame.GetAttributeOptions.class))); + return mainFrame.getAttributeImpl(selector, name, convertType(options, Frame.GetAttributeOptions.class)); } @Override public Locator getByAltText(String text, GetByAltTextOptions options) { - return withLogging("Page.getAttribute", - () -> mainFrame.getByAltText(text, convertType(options, Frame.GetByAltTextOptions.class))); + return mainFrame.getByAltText(text, convertType(options, Frame.GetByAltTextOptions.class)); } @Override public Locator getByAltText(Pattern text, GetByAltTextOptions options) { - return withLogging("Page.getByAltText", - () -> mainFrame.getByAltText(text, convertType(options, Frame.GetByAltTextOptions.class))); + return mainFrame.getByAltText(text, convertType(options, Frame.GetByAltTextOptions.class)); } @Override public Locator getByLabel(String text, GetByLabelOptions options) { - return withLogging("Page.getByLabel", - () -> mainFrame.getByLabel(text, convertType(options, Frame.GetByLabelOptions.class))); + return mainFrame.getByLabel(text, convertType(options, Frame.GetByLabelOptions.class)); } @Override public Locator getByLabel(Pattern text, GetByLabelOptions options) { - return withLogging("Page.getByLabel", - () -> mainFrame.getByLabel(text, convertType(options, Frame.GetByLabelOptions.class))); + return mainFrame.getByLabel(text, convertType(options, Frame.GetByLabelOptions.class)); } @Override public Locator getByPlaceholder(String text, GetByPlaceholderOptions options) { - return withLogging("Page.getByPlaceholder", - () -> mainFrame.getByPlaceholder(text, convertType(options, Frame.GetByPlaceholderOptions.class))); + return mainFrame.getByPlaceholder(text, convertType(options, Frame.GetByPlaceholderOptions.class)); } @Override public Locator getByPlaceholder(Pattern text, GetByPlaceholderOptions options) { - return withLogging("Page.getByPlaceholder", - () -> mainFrame.getByPlaceholder(text, convertType(options, Frame.GetByPlaceholderOptions.class))); + return mainFrame.getByPlaceholder(text, convertType(options, Frame.GetByPlaceholderOptions.class)); } @Override public Locator getByRole(AriaRole role, GetByRoleOptions options) { - return withLogging("Page.getByRole", - () -> mainFrame.getByRole(role, convertType(options, Frame.GetByRoleOptions.class))); + return mainFrame.getByRole(role, convertType(options, Frame.GetByRoleOptions.class)); } @Override public Locator getByTestId(String testId) { - return withLogging("Page.getByTestId", () -> mainFrame.getByTestId(testId)); + return mainFrame.getByTestId(testId); } @Override public Locator getByTestId(Pattern testId) { - return withLogging("Page.getByTestId", () -> mainFrame.getByTestId(testId)); + return mainFrame.getByTestId(testId); } @Override public Locator getByText(String text, GetByTextOptions options) { - return withLogging("Page.getByText", - () -> mainFrame.getByText(text, convertType(options, Frame.GetByTextOptions.class))); + return mainFrame.getByText(text, convertType(options, Frame.GetByTextOptions.class)); } @Override public Locator getByText(Pattern text, GetByTextOptions options) { - return withLogging("Page.getByText", - () -> mainFrame.getByText(text, convertType(options, Frame.GetByTextOptions.class))); + return mainFrame.getByText(text, convertType(options, Frame.GetByTextOptions.class)); } @Override public Locator getByTitle(String text, GetByTitleOptions options) { - return withLogging("Page.getByTitle", - () -> mainFrame.getByTitle(text, convertType(options, Frame.GetByTitleOptions.class))); + return mainFrame.getByTitle(text, convertType(options, Frame.GetByTitleOptions.class)); } @Override public Locator getByTitle(Pattern text, GetByTitleOptions options) { - return withLogging("Page.getByTitle", - () -> mainFrame.getByTitle(text, convertType(options, Frame.GetByTitleOptions.class))); + return mainFrame.getByTitle(text, convertType(options, Frame.GetByTitleOptions.class)); } @Override public Response goBack(GoBackOptions options) { - return withLogging("Page.goBack", () -> goBackImpl(options)); + return goBackImpl(options); } Response goBackImpl(GoBackOptions options) { @@ -919,7 +894,7 @@ Response goBackImpl(GoBackOptions options) { @Override public Response goForward(GoForwardOptions options) { - return withLogging("Page.goForward", () -> goForwardImpl(options)); + return goForwardImpl(options); } Response goForwardImpl(GoForwardOptions options) { @@ -937,46 +912,42 @@ Response goForwardImpl(GoForwardOptions options) { @Override public void requestGC() { - withLogging("Page.requestGC", () -> sendMessage("requestGC")); + sendMessage("requestGC"); } @Override public ResponseImpl navigate(String url, NavigateOptions options) { - return withLogging("Page.navigate", () -> mainFrame.navigateImpl(url, convertType(options, Frame.NavigateOptions.class))); + return mainFrame.navigateImpl(url, convertType(options, Frame.NavigateOptions.class)); } @Override public void hover(String selector, HoverOptions options) { - withLogging("Page.hover", () -> mainFrame.hoverImpl(selector, convertType(options, Frame.HoverOptions.class))); + mainFrame.hoverImpl(selector, convertType(options, Frame.HoverOptions.class)); } @Override public void dragAndDrop(String source, String target, DragAndDropOptions options) { - withLogging("Page.dragAndDrop", () -> mainFrame.dragAndDropImpl(source, target, convertType(options, Frame.DragAndDropOptions.class))); + mainFrame.dragAndDropImpl(source, target, convertType(options, Frame.DragAndDropOptions.class)); } @Override public String innerHTML(String selector, InnerHTMLOptions options) { - return withLogging("Page.innerHTML", - () -> mainFrame.innerHTMLImpl(selector, convertType(options, Frame.InnerHTMLOptions.class))); + return mainFrame.innerHTMLImpl(selector, convertType(options, Frame.InnerHTMLOptions.class)); } @Override public String innerText(String selector, InnerTextOptions options) { - return withLogging("Page.innerText", - () -> mainFrame.innerTextImpl(selector, convertType(options, Frame.InnerTextOptions.class))); + return mainFrame.innerTextImpl(selector, convertType(options, Frame.InnerTextOptions.class)); } @Override public String inputValue(String selector, InputValueOptions options) { - return withLogging("Page.inputValue", - () -> mainFrame.inputValueImpl(selector, convertType(options, Frame.InputValueOptions.class))); + return mainFrame.inputValueImpl(selector, convertType(options, Frame.InputValueOptions.class)); } @Override public boolean isChecked(String selector, IsCheckedOptions options) { - return withLogging("Page.isChecked", - () -> mainFrame.isCheckedImpl(selector, convertType(options, Frame.IsCheckedOptions.class))); + return mainFrame.isCheckedImpl(selector, convertType(options, Frame.IsCheckedOptions.class)); } @Override @@ -986,32 +957,27 @@ public boolean isClosed() { @Override public boolean isDisabled(String selector, IsDisabledOptions options) { - return withLogging("Page.isDisabled", - () -> mainFrame.isDisabledImpl(selector, convertType(options, Frame.IsDisabledOptions.class))); + return mainFrame.isDisabledImpl(selector, convertType(options, Frame.IsDisabledOptions.class)); } @Override public boolean isEditable(String selector, IsEditableOptions options) { - return withLogging("Page.isEditable", - () -> mainFrame.isEditableImpl(selector, convertType(options, Frame.IsEditableOptions.class))); + return mainFrame.isEditableImpl(selector, convertType(options, Frame.IsEditableOptions.class)); } @Override public boolean isEnabled(String selector, IsEnabledOptions options) { - return withLogging("Page.isEnabled", - () -> mainFrame.isEnabledImpl(selector, convertType(options, Frame.IsEnabledOptions.class))); + return mainFrame.isEnabledImpl(selector, convertType(options, Frame.IsEnabledOptions.class)); } @Override public boolean isHidden(String selector, IsHiddenOptions options) { - return withLogging("Page.isHidden", - () -> mainFrame.isHiddenImpl(selector, convertType(options, Frame.IsHiddenOptions.class))); + return mainFrame.isHiddenImpl(selector, convertType(options, Frame.IsHiddenOptions.class)); } @Override public boolean isVisible(String selector, IsVisibleOptions options) { - return withLogging("Page.isVisible", - () -> mainFrame.isVisibleImpl(selector, convertType(options, Frame.IsVisibleOptions.class))); + return mainFrame.isVisibleImpl(selector, convertType(options, Frame.IsVisibleOptions.class)); } @Override @@ -1044,23 +1010,21 @@ public PageImpl opener() { @Override public void pause() { - withLogging("Page.pause", () -> { - Double defaultNavigationTimeout = browserContext.timeoutSettings.defaultNavigationTimeout(); - Double defaultTimeout = browserContext.timeoutSettings.defaultTimeout(); - browserContext.setDefaultNavigationTimeout(0.0); - browserContext.setDefaultTimeout(0.0); - try { - runUntil(() -> {}, new WaitableRace<>(asList(context().pause(), (Waitable) waitableClosedOrCrashed))); - } finally { - browserContext.setDefaultNavigationTimeout(defaultNavigationTimeout); - browserContext.setDefaultTimeout(defaultTimeout); - } - }); + Double defaultNavigationTimeout = browserContext.timeoutSettings.defaultNavigationTimeout(); + Double defaultTimeout = browserContext.timeoutSettings.defaultTimeout(); + browserContext.setDefaultNavigationTimeout(0.0); + browserContext.setDefaultTimeout(0.0); + try { + runUntil(() -> {}, new WaitableRace<>(asList(context().pause(), (Waitable) waitableClosedOrCrashed))); + } finally { + browserContext.setDefaultNavigationTimeout(defaultNavigationTimeout); + browserContext.setDefaultTimeout(defaultTimeout); + } } @Override public byte[] pdf(PdfOptions options) { - return withLogging("Page.pdf", () -> pdfImpl(options)); + return pdfImpl(options); } private byte[] pdfImpl(PdfOptions options) { @@ -1079,13 +1043,12 @@ private byte[] pdfImpl(PdfOptions options) { @Override public void press(String selector, String key, PressOptions options) { - withLogging("Page.press", - () -> mainFrame.pressImpl(selector, key, convertType(options, Frame.PressOptions.class))); + mainFrame.pressImpl(selector, key, convertType(options, Frame.PressOptions.class)); } @Override public Response reload(ReloadOptions options) { - return withLogging("Page.reload", () -> reloadImpl(options)); + return reloadImpl(options); } @Override @@ -1137,10 +1100,8 @@ public void routeFromHAR(Path har, RouteFromHAROptions options) { } private void route(UrlMatcher matcher, Consumer handler, RouteOptions options) { - withLogging("Page.route", () -> { - routes.add(matcher, handler, options == null ? null : options.times); - updateInterceptionPatterns(); - }); + routes.add(matcher, handler, options == null ? null : options.times); + updateInterceptionPatterns(); } @Override @@ -1159,15 +1120,13 @@ public void routeWebSocket(Predicate predicate, Consumer } private void routeWebSocketImpl(UrlMatcher matcher, Consumer handler) { - withLogging("Page.routeWebSocket", () -> { - webSocketRoutes.add(matcher, handler); - updateWebSocketInterceptionPatterns(); - }); + webSocketRoutes.add(matcher, handler); + updateWebSocketInterceptionPatterns(); } @Override public byte[] screenshot(ScreenshotOptions options) { - return withLogging("Page.screenshot", () -> screenshotImpl(options)); + return screenshotImpl(options); } @Override @@ -1184,8 +1143,7 @@ public List selectOption(String selector, ElementHandle value, SelectOpt @Override public List selectOption(String selector, String[] values, SelectOptionOptions options) { - return withLogging("Page.selectOption", - () -> mainFrame.selectOptionImpl(selector, values, convertType(options, Frame.SelectOptionOptions.class))); + return mainFrame.selectOptionImpl(selector, values, convertType(options, Frame.SelectOptionOptions.class)); } @Override @@ -1235,56 +1193,46 @@ private byte[] screenshotImpl(ScreenshotOptions options) { @Override public List selectOption(String selector, SelectOption[] values, SelectOptionOptions options) { - return withLogging("Page.selectOption", - () -> mainFrame.selectOptionImpl(selector, values, convertType(options, Frame.SelectOptionOptions.class))); + return mainFrame.selectOptionImpl(selector, values, convertType(options, Frame.SelectOptionOptions.class)); } @Override public List selectOption(String selector, ElementHandle[] values, SelectOptionOptions options) { - return withLogging("Page.selectOption", - () -> mainFrame.selectOptionImpl(selector, values, convertType(options, Frame.SelectOptionOptions.class))); + return mainFrame.selectOptionImpl(selector, values, convertType(options, Frame.SelectOptionOptions.class)); } @Override public void setChecked(String selector, boolean checked, SetCheckedOptions options) { - withLogging("Page.setChecked", - () -> mainFrame.setCheckedImpl(selector, checked, convertType(options, Frame.SetCheckedOptions.class))); + mainFrame.setCheckedImpl(selector, checked, convertType(options, Frame.SetCheckedOptions.class)); } @Override public void setContent(String html, SetContentOptions options) { - withLogging("Page.setContent", - () -> mainFrame.setContentImpl(html, convertType(options, Frame.SetContentOptions.class))); + mainFrame.setContentImpl(html, convertType(options, Frame.SetContentOptions.class)); } @Override public void setDefaultNavigationTimeout(double timeout) { - withLogging("Page.setDefaultNavigationTimeout", () -> { - timeoutSettings.setDefaultNavigationTimeout(timeout); - }); + timeoutSettings.setDefaultNavigationTimeout(timeout); } @Override public void setDefaultTimeout(double timeout) { - withLogging("Page.setDefaultTimeout", () -> { - timeoutSettings.setDefaultTimeout(timeout); - }); + timeoutSettings.setDefaultTimeout(timeout); } @Override public void setExtraHTTPHeaders(Map headers) { - withLogging("Page.setExtraHTTPHeaders", () -> { - JsonObject params = new JsonObject(); - JsonArray jsonHeaders = new JsonArray(); - for (Map.Entry e : headers.entrySet()) { - JsonObject header = new JsonObject(); - header.addProperty("name", e.getKey()); - header.addProperty("value", e.getValue()); - jsonHeaders.add(header); - } - params.add("headers", jsonHeaders); - sendMessage("setExtraHTTPHeaders", params); - }); + JsonObject params = new JsonObject(); + JsonArray jsonHeaders = new JsonArray(); + for (Map.Entry e : headers.entrySet()) { + JsonObject header = new JsonObject(); + header.addProperty("name", e.getKey()); + header.addProperty("value", e.getValue()); + jsonHeaders.add(header); + } + params.add("headers", jsonHeaders); + sendMessage("setExtraHTTPHeaders", params); } @Override @@ -1294,8 +1242,7 @@ public void setInputFiles(String selector, Path files, SetInputFilesOptions opti @Override public void setInputFiles(String selector, Path[] files, SetInputFilesOptions options) { - withLogging("Page.setInputFiles", - () -> mainFrame.setInputFilesImpl(selector, files, convertType(options, Frame.SetInputFilesOptions.class))); + mainFrame.setInputFilesImpl(selector, files, convertType(options, Frame.SetInputFilesOptions.class)); } @Override @@ -1305,35 +1252,30 @@ public void setInputFiles(String selector, FilePayload files, SetInputFilesOptio @Override public void setInputFiles(String selector, FilePayload[] files, SetInputFilesOptions options) { - withLogging("Page.setInputFiles", - () -> mainFrame.setInputFilesImpl(selector, files, convertType(options, Frame.SetInputFilesOptions.class))); + mainFrame.setInputFilesImpl(selector, files, convertType(options, Frame.SetInputFilesOptions.class)); } @Override public void setViewportSize(int width, int height) { - withLogging("Page.setViewportSize", () -> { - viewport = new ViewportSize(width, height); - JsonObject params = new JsonObject(); - params.add("viewportSize", gson().toJsonTree(viewport)); - sendMessage("setViewportSize", params); - }); + viewport = new ViewportSize(width, height); + JsonObject params = new JsonObject(); + params.add("viewportSize", gson().toJsonTree(viewport)); + sendMessage("setViewportSize", params); } @Override public void tap(String selector, TapOptions options) { - withLogging("Page.tap", - () -> mainFrame.tapImpl(selector, convertType(options, Frame.TapOptions.class))); + mainFrame.tapImpl(selector, convertType(options, Frame.TapOptions.class)); } @Override public String textContent(String selector, TextContentOptions options) { - return withLogging("Page.textContent", - () -> mainFrame.textContentImpl(selector, convertType(options, Frame.TextContentOptions.class))); + return mainFrame.textContentImpl(selector, convertType(options, Frame.TextContentOptions.class)); } @Override public String title() { - return withLogging("Page.title", () -> mainFrame.titleImpl()); + return mainFrame.titleImpl(); } @Override @@ -1343,22 +1285,18 @@ public Touchscreen touchscreen() { @Override public void type(String selector, String text, TypeOptions options) { - withLogging("Page.type", - () -> mainFrame.typeImpl(selector, text, convertType(options, Frame.TypeOptions.class))); + mainFrame.typeImpl(selector, text, convertType(options, Frame.TypeOptions.class)); } @Override public void uncheck(String selector, UncheckOptions options) { - withLogging("Page.uncheck", - () -> mainFrame.uncheckImpl(selector, convertType(options, Frame.UncheckOptions.class))); + mainFrame.uncheckImpl(selector, convertType(options, Frame.UncheckOptions.class)); } @Override public void unrouteAll() { - withLogging("Page.unrouteAll", () -> { - routes.removeAll(); - updateInterceptionPatterns(); - }); + routes.removeAll(); + updateInterceptionPatterns(); } @Override @@ -1377,10 +1315,8 @@ public void unroute(Predicate url, Consumer handler) { } private void unroute(UrlMatcher matcher, Consumer handler) { - withLogging("Page.unroute", () -> { - routes.remove(matcher, handler); - updateInterceptionPatterns(); - }); + routes.remove(matcher, handler); + updateInterceptionPatterns(); } private void updateInterceptionPatterns() { @@ -1430,8 +1366,7 @@ Waitable createWaitableTimeout(Double timeout) { @Override public JSHandle waitForFunction(String pageFunction, Object arg, WaitForFunctionOptions options) { - return withLogging("Page.waitForFunction", - () -> mainFrame.waitForFunctionImpl(pageFunction, arg, convertType(options, Frame.WaitForFunctionOptions.class))); + return mainFrame.waitForFunctionImpl(pageFunction, arg, convertType(options, Frame.WaitForFunctionOptions.class)); } @Override @@ -1584,8 +1519,7 @@ private Response waitForResponseImpl(Predicate predicate, WaitForRespo @Override public ElementHandle waitForSelector(String selector, WaitForSelectorOptions options) { - return withLogging("Page.waitForSelector", - () -> mainFrame.waitForSelectorImpl(selector, convertType(options, Frame.WaitForSelectorOptions.class))); + return mainFrame.waitForSelectorImpl(selector, convertType(options, Frame.WaitForSelectorOptions.class)); } @Override @@ -1599,7 +1533,7 @@ public void waitForCondition(BooleanSupplier predicate, WaitForConditionOptions @Override public void waitForTimeout(double timeout) { - withLogging("Page.waitForTimeout", () -> mainFrame.waitForTimeoutImpl(timeout)); + mainFrame.waitForTimeoutImpl(timeout); } @Override diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/RequestImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/RequestImpl.java index 30a495619..cc650ce8f 100644 --- a/playwright/src/main/java/com/microsoft/playwright/impl/RequestImpl.java +++ b/playwright/src/main/java/com/microsoft/playwright/impl/RequestImpl.java @@ -68,7 +68,7 @@ static class FallbackOverrides { @Override public Map allHeaders() { - return withLogging("Request.allHeaders", () -> getRawHeaders().headers()); + return getRawHeaders().headers(); } @Override @@ -97,12 +97,12 @@ public Map headers() { @Override public List headersArray() { - return withLogging("Request.headersArray", () -> getRawHeaders().headersArray()); + return getRawHeaders().headersArray(); } @Override public String headerValue(String name) { - return withLogging("Request.headerValue", () -> getRawHeaders().get(name)); + return getRawHeaders().get(name); } @Override @@ -152,25 +152,21 @@ public String resourceType() { @Override public ResponseImpl response() { - return withLogging("Request.response", () -> { - JsonObject result = sendMessage("response").getAsJsonObject(); - if (!result.has("response")) { - return null; - } - return connection.getExistingObject(result.getAsJsonObject("response").get("guid").getAsString()); - }); + JsonObject result = sendMessage("response").getAsJsonObject(); + if (!result.has("response")) { + return null; + } + return connection.getExistingObject(result.getAsJsonObject("response").get("guid").getAsString()); } @Override public Sizes sizes() { - return withLogging("Request.sizes", () -> { - ResponseImpl response = response(); - if (response == null) { - throw new PlaywrightException("Unable to fetch sizes for failed request"); - } - JsonObject json = response.sendMessage("sizes").getAsJsonObject(); - return gson().fromJson(json.getAsJsonObject("sizes"), Sizes.class); - }); + ResponseImpl response = response(); + if (response == null) { + throw new PlaywrightException("Unable to fetch sizes for failed request"); + } + JsonObject json = response.sendMessage("sizes").getAsJsonObject(); + return gson().fromJson(json.getAsJsonObject("sizes"), Sizes.class); } @Override @@ -197,10 +193,8 @@ private RawHeaders getRawHeaders() { if (rawHeaders != null) { return rawHeaders; } - JsonArray rawHeadersJson = withLogging("Request.allHeaders", () -> { - JsonObject result = sendMessage("rawRequestHeaders").getAsJsonObject(); - return result.getAsJsonArray("headers"); - }); + JsonObject result = sendMessage("rawRequestHeaders").getAsJsonObject(); + JsonArray rawHeadersJson = result.getAsJsonArray("headers"); // The field may have been initialized in a nested call but it is ok. rawHeaders = new RawHeaders(asList(gson().fromJson(rawHeadersJson, HttpHeader[].class))); diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/ResponseImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/ResponseImpl.java index 78368662f..40be3c548 100644 --- a/playwright/src/main/java/com/microsoft/playwright/impl/ResponseImpl.java +++ b/playwright/src/main/java/com/microsoft/playwright/impl/ResponseImpl.java @@ -47,15 +47,13 @@ public class ResponseImpl extends ChannelOwner implements Response { @Override public Map allHeaders() { - return withLogging("Response.allHeaders", () -> getRawHeaders().headers()); + return getRawHeaders().headers(); } @Override public byte[] body() { - return withLogging("Response.body", () -> { - JsonObject json = sendMessage("body").getAsJsonObject(); - return Base64.getDecoder().decode(json.get("binary").getAsString()); - }); + JsonObject json = sendMessage("body").getAsJsonObject(); + return Base64.getDecoder().decode(json.get("binary").getAsString()); } @Override @@ -95,7 +93,7 @@ public Map headers() { @Override public List headersArray() { - return withLogging("Response.headersArray", () -> getRawHeaders().headersArray()); + return getRawHeaders().headersArray(); } @Override @@ -120,24 +118,20 @@ public RequestImpl request() { @Override public SecurityDetails securityDetails() { - return withLogging("Response.securityDetails", () -> { - JsonObject json = sendMessage("securityDetails").getAsJsonObject(); - if (json.has("value")) { - return gson().fromJson(json.get("value"), SecurityDetails.class); - } - return null; - }); + JsonObject json = sendMessage("securityDetails").getAsJsonObject(); + if (json.has("value")) { + return gson().fromJson(json.get("value"), SecurityDetails.class); + } + return null; } @Override public ServerAddr serverAddr() { - return withLogging("Response.serverAddr", () -> { - JsonObject json = sendMessage("serverAddr").getAsJsonObject(); - if (json.has("value")) { - return gson().fromJson(json.get("value"), ServerAddr.class); - } - return null; - }); + JsonObject json = sendMessage("serverAddr").getAsJsonObject(); + if (json.has("value")) { + return gson().fromJson(json.get("value"), ServerAddr.class); + } + return null; } @Override diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/RouteImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/RouteImpl.java index 1533f7b89..efa924c48 100644 --- a/playwright/src/main/java/com/microsoft/playwright/impl/RouteImpl.java +++ b/playwright/src/main/java/com/microsoft/playwright/impl/RouteImpl.java @@ -44,11 +44,9 @@ public RouteImpl(ChannelOwner parent, String type, String guid, JsonObject initi @Override public void abort(String errorCode) { startHandling(); - withLogging("Route.abort", () -> { - JsonObject params = new JsonObject(); - params.addProperty("errorCode", errorCode); - sendMessageAsync("abort", params); - }); + JsonObject params = new JsonObject(); + params.addProperty("errorCode", errorCode); + sendMessageAsync("abort", params); } boolean isHandled() { @@ -63,7 +61,7 @@ public void resume(ResumeOptions options) { void resume(ResumeOptions options, boolean isFallback) { startHandling(); applyOverrides(convertType(options, FallbackOptions.class)); - withLogging("Route.resume", () -> resumeImpl(request().fallbackOverridesForResume(), isFallback)); + resumeImpl(request().fallbackOverridesForResume(), isFallback); } @Override @@ -151,7 +149,7 @@ private static byte[] getPostDataBytes(Object postData) { @Override public void fulfill(FulfillOptions options) { startHandling(); - withLogging("Route.fulfill", () -> fulfillImpl(options)); + fulfillImpl(options); } private void fulfillImpl(FulfillOptions options) { diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/SelectorsImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/SelectorsImpl.java index a150afe3a..de7429b7f 100644 --- a/playwright/src/main/java/com/microsoft/playwright/impl/SelectorsImpl.java +++ b/playwright/src/main/java/com/microsoft/playwright/impl/SelectorsImpl.java @@ -52,20 +52,18 @@ public void setTestIdAttribute(String attributeName) { @Override public void register(String name, String script, RegisterOptions options) { - withLogging("Selectors.register", () -> registerImpl(name, script, options)); + registerImpl(name, script, options); } @Override public void register(String name, Path path, RegisterOptions options) { - withLogging("Selectors.register", () -> { - byte[] buffer; - try { - buffer = Files.readAllBytes(path); - } catch (IOException e) { - throw new PlaywrightException("Failed to read selector from file: " + path, e); - } - registerImpl(name, new String(buffer, UTF_8), options); - }); + byte[] buffer; + try { + buffer = Files.readAllBytes(path); + } catch (IOException e) { + throw new PlaywrightException("Failed to read selector from file: " + path, e); + } + registerImpl(name, new String(buffer, UTF_8), options); } private void registerImpl(String name, String script, RegisterOptions options) { diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/TouchscreenImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/TouchscreenImpl.java index 3e4289399..4907df2d2 100644 --- a/playwright/src/main/java/com/microsoft/playwright/impl/TouchscreenImpl.java +++ b/playwright/src/main/java/com/microsoft/playwright/impl/TouchscreenImpl.java @@ -28,11 +28,9 @@ class TouchscreenImpl implements Touchscreen { @Override public void tap(double x, double y) { - page.withLogging("Touchscreen.tap", () -> { - JsonObject params = new JsonObject(); - params.addProperty("x", x); - params.addProperty("y", y); - page.sendMessage("touchscreenTap", params); - }); + JsonObject params = new JsonObject(); + params.addProperty("x", x); + params.addProperty("y", y); + page.sendMessage("touchscreenTap", params); } } diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/TracingImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/TracingImpl.java index 9234d89b2..d02921189 100644 --- a/playwright/src/main/java/com/microsoft/playwright/impl/TracingImpl.java +++ b/playwright/src/main/java/com/microsoft/playwright/impl/TracingImpl.java @@ -87,7 +87,7 @@ public void startChunk(StartChunkOptions options) { @Override public void group(String name, GroupOptions options) { - withLogging("Tracing.group", () -> groupImpl(name, options)); + groupImpl(name, options); } private void groupImpl(String name, GroupOptions options) { @@ -101,7 +101,7 @@ private void groupImpl(String name, GroupOptions options) { @Override public void groupEnd() { - withLogging("Tracing.groupEnd", () -> sendMessage("tracingGroupEnd")); + sendMessage("tracingGroupEnd"); } private void tracingStartChunk(String name, String title) { diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/VideoImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/VideoImpl.java index d69a936c7..15e56d0b1 100644 --- a/playwright/src/main/java/com/microsoft/playwright/impl/VideoImpl.java +++ b/playwright/src/main/java/com/microsoft/playwright/impl/VideoImpl.java @@ -30,7 +30,6 @@ class VideoImpl implements Video { VideoImpl(PageImpl page) { this.page = page; - BrowserImpl browser = page.context().browser(); } void setArtifact(ArtifactImpl artifact) { @@ -44,39 +43,33 @@ private ArtifactImpl waitForArtifact() { @Override public void delete() { - page.withLogging("Video.delete", () -> { - try { - waitForArtifact().delete(); - } catch (PlaywrightException e) { - } - }); + try { + waitForArtifact().delete(); + } catch (PlaywrightException e) { + } } @Override public Path path() { - return page.withLogging("Video.path", () -> { - if (page.connection.isRemote) { - throw new PlaywrightException("Path is not available when using browserType.connect(). Use saveAs() to save a local copy."); - } - try { - return Paths.get(waitForArtifact().initializer.get("absolutePath").getAsString()); - } catch (PlaywrightException e) { - throw new PlaywrightException("Page did not produce any video frames", e); - } - }); + if (page.connection.isRemote) { + throw new PlaywrightException("Path is not available when using browserType.connect(). Use saveAs() to save a local copy."); + } + try { + return Paths.get(waitForArtifact().initializer.get("absolutePath").getAsString()); + } catch (PlaywrightException e) { + throw new PlaywrightException("Page did not produce any video frames", e); + } } @Override public void saveAs(Path path) { - page.withLogging("Video.saveAs", () -> { - if (!page.isClosed()) { - throw new PlaywrightException("Page is not yet closed. Close the page prior to calling saveAs"); - } - try { - waitForArtifact().saveAs(path); - } catch (PlaywrightException e) { - throw new PlaywrightException("Page did not produce any video frames", e); - } - }); + if (!page.isClosed()) { + throw new PlaywrightException("Page is not yet closed. Close the page prior to calling saveAs"); + } + try { + waitForArtifact().saveAs(path); + } catch (PlaywrightException e) { + throw new PlaywrightException("Page did not produce any video frames", e); + } } } diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/WaitForEventLogger.java b/playwright/src/main/java/com/microsoft/playwright/impl/WaitForEventLogger.java index 8b5eab7e5..26216d5fa 100644 --- a/playwright/src/main/java/com/microsoft/playwright/impl/WaitForEventLogger.java +++ b/playwright/src/main/java/com/microsoft/playwright/impl/WaitForEventLogger.java @@ -38,23 +38,21 @@ public class WaitForEventLogger implements Supplier, Logger { @Override public T get() { - return channel.withLogging(apiName, () -> { - { - JsonObject info = new JsonObject(); - info.addProperty("phase", "before"); - sendWaitForEventInfo(info); - } + { JsonObject info = new JsonObject(); - info.addProperty("phase", "after"); - try { - return supplier.apply(this); - } catch (RuntimeException e) { - info.addProperty("error", e.getMessage()); - throw e; - } finally { - sendWaitForEventInfo(info); - } - }); + info.addProperty("phase", "before"); + sendWaitForEventInfo(info); + } + JsonObject info = new JsonObject(); + info.addProperty("phase", "after"); + try { + return supplier.apply(this); + } catch (RuntimeException e) { + info.addProperty("error", e.getMessage()); + throw e; + } finally { + sendWaitForEventInfo(info); + } } @Override diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/WorkerImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/WorkerImpl.java index c0c2e5d42..362d69b52 100644 --- a/playwright/src/main/java/com/microsoft/playwright/impl/WorkerImpl.java +++ b/playwright/src/main/java/com/microsoft/playwright/impl/WorkerImpl.java @@ -71,25 +71,21 @@ private Worker waitForCloseImpl(WaitForCloseOptions options, Runnable code) { @Override public Object evaluate(String pageFunction, Object arg) { - return withLogging("Worker.evaluate", () -> { - JsonObject params = new JsonObject(); - params.addProperty("expression", pageFunction); - params.add("arg", gson().toJsonTree(serializeArgument(arg))); - JsonElement json = sendMessage("evaluateExpression", params); - SerializedValue value = gson().fromJson(json.getAsJsonObject().get("value"), SerializedValue.class); - return deserialize(value); - }); + JsonObject params = new JsonObject(); + params.addProperty("expression", pageFunction); + params.add("arg", gson().toJsonTree(serializeArgument(arg))); + JsonElement json = sendMessage("evaluateExpression", params); + SerializedValue value = gson().fromJson(json.getAsJsonObject().get("value"), SerializedValue.class); + return deserialize(value); } @Override public JSHandle evaluateHandle(String pageFunction, Object arg) { - return withLogging("Worker.evaluateHandle", () -> { - JsonObject params = new JsonObject(); - params.addProperty("expression", pageFunction); - params.add("arg", gson().toJsonTree(serializeArgument(arg))); - JsonElement json = sendMessage("evaluateExpressionHandle", params); - return connection.getExistingObject(json.getAsJsonObject().getAsJsonObject("handle").get("guid").getAsString()); - }); + JsonObject params = new JsonObject(); + params.addProperty("expression", pageFunction); + params.add("arg", gson().toJsonTree(serializeArgument(arg))); + JsonElement json = sendMessage("evaluateExpressionHandle", params); + return connection.getExistingObject(json.getAsJsonObject().getAsJsonObject("handle").get("guid").getAsString()); } @Override From add74ab57f06a7e5e9089eb163e49b8bbf87f9c3 Mon Sep 17 00:00:00 2001 From: Simon Knott Date: Fri, 13 Jun 2025 09:01:32 +0200 Subject: [PATCH 2/3] inline impls --- .../impl/APIRequestContextImpl.java | 4 - .../playwright/impl/APIRequestImpl.java | 4 - .../playwright/impl/BrowserContextImpl.java | 35 ++----- .../playwright/impl/BrowserImpl.java | 4 - .../playwright/impl/BrowserTypeImpl.java | 16 --- .../playwright/impl/ElementHandleImpl.java | 97 +++---------------- .../microsoft/playwright/impl/FrameImpl.java | 31 +++--- .../playwright/impl/LocatorImpl.java | 12 --- .../microsoft/playwright/impl/MouseImpl.java | 26 +---- 9 files changed, 35 insertions(+), 194 deletions(-) diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/APIRequestContextImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/APIRequestContextImpl.java index b40a111b2..0e1aeebdb 100644 --- a/playwright/src/main/java/com/microsoft/playwright/impl/APIRequestContextImpl.java +++ b/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(); } diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/APIRequestImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/APIRequestImpl.java index e6b545418..88ca8d009 100644 --- a/playwright/src/main/java/com/microsoft/playwright/impl/APIRequestImpl.java +++ b/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 { diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/BrowserContextImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/BrowserContextImpl.java index 3cc6869c8..76f46ba65 100644 --- a/playwright/src/main/java/com/microsoft/playwright/impl/BrowserContextImpl.java +++ b/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 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 cookies(String url) { + return cookies(url == null ? new ArrayList<>() : Collections.singletonList(url)); + } + + @Override public void addCookies(List 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 cookies(List urls) { - return cookiesImpl(urls); - } - - private List cookiesImpl(List 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 permissions, GrantPermissionsOptions options) { - grantPermissionsImpl(permissions, options); - } - - private void grantPermissionsImpl(List permissions, GrantPermissionsOptions options) { if (options == null) { options = new GrantPermissionsOptions(); } @@ -451,10 +436,6 @@ private void grantPermissionsImpl(List 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(); } diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/BrowserImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/BrowserImpl.java index 2c91b284c..e8ddd1c6b 100644 --- a/playwright/src/main/java/com/microsoft/playwright/impl/BrowserImpl.java +++ b/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 { diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/BrowserTypeImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/BrowserTypeImpl.java index 0f402f9a2..e23437fa7 100644 --- a/playwright/src/main/java/com/microsoft/playwright/impl/BrowserTypeImpl.java +++ b/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 { diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/ElementHandleImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/ElementHandleImpl.java index 0914a97d4..c81d457d6 100644 --- a/playwright/src/main/java/com/microsoft/playwright/impl/ElementHandleImpl.java +++ b/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 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 selectOption(SelectOption[] values, SelectOptionOptions options) { @@ -411,7 +373,12 @@ private List 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(); } diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/FrameImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/FrameImpl.java index 22dab38ea..5bcbe553d 100644 --- a/playwright/src/main/java/com/microsoft/playwright/impl/FrameImpl.java +++ b/playwright/src/main/java/com/microsoft/playwright/impl/FrameImpl.java @@ -74,10 +74,6 @@ private static WaitUntilState loadStateFromProtocol(String value) { @Override public ElementHandle querySelector(String selector, QuerySelectorOptions options) { - return querySelectorImpl(selector, options); - } - - ElementHandleImpl querySelectorImpl(String selector, QuerySelectorOptions options) { if (options == null) { options = new QuerySelectorOptions(); } @@ -93,7 +89,18 @@ ElementHandleImpl querySelectorImpl(String selector, QuerySelectorOptions option @Override public List querySelectorAll(String selector) { - return querySelectorAllImpl(selector); + JsonObject params = new JsonObject(); + params.addProperty("selector", selector); + JsonElement json = sendMessage("querySelectorAll", params); + JsonArray elements = json.getAsJsonObject().getAsJsonArray("elements"); + if (elements == null) { + return null; + } + List handles = new ArrayList<>(); + for (JsonElement item : elements) { + handles.add(connection.getExistingObject(item.getAsJsonObject().get("guid").getAsString())); + } + return handles; } @Override @@ -119,20 +126,6 @@ public List selectOption(String selector, SelectOption value, SelectOpti return selectOption(selector, values, options); } - List querySelectorAllImpl(String selector) { - JsonObject params = new JsonObject(); - params.addProperty("selector", selector); - JsonElement json = sendMessage("querySelectorAll", params); - JsonArray elements = json.getAsJsonObject().getAsJsonArray("elements"); - if (elements == null) { - return null; - } - List handles = new ArrayList<>(); - for (JsonElement item : elements) { - handles.add(connection.getExistingObject(item.getAsJsonObject().get("guid").getAsString())); - } - return handles; - } @Override public Object evalOnSelector(String selector, String pageFunction, Object arg, EvalOnSelectorOptions options) { diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/LocatorImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/LocatorImpl.java index fb8563d62..d0d1138a0 100644 --- a/playwright/src/main/java/com/microsoft/playwright/impl/LocatorImpl.java +++ b/playwright/src/main/java/com/microsoft/playwright/impl/LocatorImpl.java @@ -118,10 +118,6 @@ public Locator and(Locator locator) { @Override public String ariaSnapshot(AriaSnapshotOptions options) { - return ariaSnapshotImpl(options); - } - - private String ariaSnapshotImpl(AriaSnapshotOptions options) { if (options == null) { options = new AriaSnapshotOptions(); } @@ -134,10 +130,6 @@ private String ariaSnapshotImpl(AriaSnapshotOptions options) { @Override public void blur(BlurOptions options) { - blurImpl(options); - } - - private void blurImpl(BlurOptions options) { if (options == null) { options = new BlurOptions(); } @@ -632,10 +624,6 @@ public void waitFor(WaitForOptions options) { if (options == null) { options = new WaitForOptions(); } - waitForImpl(options); - } - - private void waitForImpl(WaitForOptions options) { frame.waitForSelectorImpl(selector, convertType(options, Frame.WaitForSelectorOptions.class).setStrict(true), true); } diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/MouseImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/MouseImpl.java index 2f6e6c267..5a6eb0451 100644 --- a/playwright/src/main/java/com/microsoft/playwright/impl/MouseImpl.java +++ b/playwright/src/main/java/com/microsoft/playwright/impl/MouseImpl.java @@ -31,10 +31,6 @@ class MouseImpl implements Mouse { @Override public void click(double x, double y, ClickOptions options) { - clickImpl(x, y, options); - } - - private void clickImpl(double x, double y, ClickOptions options) { if (options == null) { options = new ClickOptions(); } @@ -62,10 +58,6 @@ private void dblclickImpl(double x, double y, DblclickOptions options) { @Override public void down(DownOptions options) { - downImpl(options); - } - - private void downImpl(DownOptions options) { if (options == null) { options = new DownOptions(); } @@ -75,10 +67,6 @@ private void downImpl(DownOptions options) { @Override public void move(double x, double y, MoveOptions options) { - moveImpl(x, y, options); - } - - private void moveImpl(double x, double y, MoveOptions options) { if (options == null) { options = new MoveOptions(); } @@ -90,7 +78,11 @@ private void moveImpl(double x, double y, MoveOptions options) { @Override public void up(UpOptions options) { - upImpl(options); + if (options == null) { + options = new UpOptions(); + } + JsonObject params = gson().toJsonTree(options).getAsJsonObject(); + page.sendMessage("mouseUp", params); } @Override @@ -100,12 +92,4 @@ public void wheel(double deltaX, double deltaY) { params.addProperty("deltaY", deltaY); page.sendMessage("mouseWheel", params); } - - private void upImpl(UpOptions options) { - if (options == null) { - options = new UpOptions(); - } - JsonObject params = gson().toJsonTree(options).getAsJsonObject(); - page.sendMessage("mouseUp", params); - } } From 1ac42a34c1640eaf74c3ad5798418e93dcb2fe51 Mon Sep 17 00:00:00 2001 From: Simon Knott Date: Fri, 13 Jun 2025 09:12:42 +0200 Subject: [PATCH 3/3] some more inlining --- .../playwright/impl/BrowserContextImpl.java | 12 +-- .../playwright/impl/BrowserImpl.java | 12 --- .../playwright/impl/FileChooserImpl.java | 4 +- .../microsoft/playwright/impl/FrameImpl.java | 90 ++----------------- .../microsoft/playwright/impl/PageImpl.java | 38 ++++---- 5 files changed, 34 insertions(+), 122 deletions(-) diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/BrowserContextImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/BrowserContextImpl.java index 76f46ba65..c0494968f 100644 --- a/playwright/src/main/java/com/microsoft/playwright/impl/BrowserContextImpl.java +++ b/playwright/src/main/java/com/microsoft/playwright/impl/BrowserContextImpl.java @@ -324,14 +324,16 @@ public void addCookies(List 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 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; diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/BrowserImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/BrowserImpl.java index e8ddd1c6b..7abf7ede2 100644 --- a/playwright/src/main/java/com/microsoft/playwright/impl/BrowserImpl.java +++ b/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(); diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/FileChooserImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/FileChooserImpl.java index 4a8944e1a..82a1fbfef 100644 --- a/playwright/src/main/java/com/microsoft/playwright/impl/FileChooserImpl.java +++ b/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)); } } diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/FrameImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/FrameImpl.java index 5bcbe553d..d2e7dec0d 100644 --- a/playwright/src/main/java/com/microsoft/playwright/impl/FrameImpl.java +++ b/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,8 +318,8 @@ 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 @@ -359,11 +327,6 @@ 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); diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/PageImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/PageImpl.java index 9baa7eaa7..5ce435dd2 100644 --- a/playwright/src/main/java/com/microsoft/playwright/impl/PageImpl.java +++ b/playwright/src/main/java/com/microsoft/playwright/impl/PageImpl.java @@ -558,13 +558,13 @@ public void close(CloseOptions options) { @Override public ElementHandle querySelector(String selector, QuerySelectorOptions options) { - return mainFrame.querySelectorImpl( + return mainFrame.querySelector( selector, convertType(options, Frame.QuerySelectorOptions.class)); } @Override public List querySelectorAll(String selector) { - return mainFrame.querySelectorAllImpl(selector); + return mainFrame.querySelectorAll(selector); } @Override @@ -672,7 +672,7 @@ public void bringToFront() { @Override public void check(String selector, CheckOptions options) { - mainFrame.checkImpl(selector, convertType(options, Frame.CheckOptions.class)); + mainFrame.check(selector, convertType(options, Frame.CheckOptions.class)); } @Override @@ -682,7 +682,7 @@ public void click(String selector, ClickOptions options) { @Override public String content() { - return mainFrame.contentImpl(); + return mainFrame.content(); } @Override @@ -692,12 +692,12 @@ public BrowserContextImpl context() { @Override public void dblclick(String selector, DblclickOptions options) { - mainFrame.dblclickImpl(selector, convertType(options, Frame.DblclickOptions.class)); + mainFrame.dblclick(selector, convertType(options, Frame.DblclickOptions.class)); } @Override public void dispatchEvent(String selector, String type, Object eventInit, DispatchEventOptions options) { - mainFrame.dispatchEventImpl(selector, type, eventInit, convertType(options, Frame.DispatchEventOptions.class)); + mainFrame.dispatchEvent(selector, type, eventInit, convertType(options, Frame.DispatchEventOptions.class)); } @Override @@ -715,12 +715,12 @@ private void emulateMediaImpl(EmulateMediaOptions options) { @Override public Object evaluate(String expression, Object arg) { - return mainFrame.evaluateImpl(expression, arg); + return mainFrame.evaluate(expression, arg); } @Override public JSHandle evaluateHandle(String pageFunction, Object arg) { - return mainFrame.evaluateHandleImpl(pageFunction, arg); + return mainFrame.evaluateHandle(pageFunction, arg); } @Override @@ -752,12 +752,12 @@ public void exposeFunction(String name, FunctionCallback playwrightFunction) { @Override public void fill(String selector, String value, FillOptions options) { - mainFrame.fillImpl(selector, value, convertType(options, Frame.FillOptions.class)); + mainFrame.fill(selector, value, convertType(options, Frame.FillOptions.class)); } @Override public void focus(String selector, FocusOptions options) { - mainFrame.focusImpl(selector, convertType(options, Frame.FocusOptions.class)); + mainFrame.focus(selector, convertType(options, Frame.FocusOptions.class)); } @Override @@ -1208,7 +1208,7 @@ public void setChecked(String selector, boolean checked, SetCheckedOptions optio @Override public void setContent(String html, SetContentOptions options) { - mainFrame.setContentImpl(html, convertType(options, Frame.SetContentOptions.class)); + mainFrame.setContent(html, convertType(options, Frame.SetContentOptions.class)); } @Override @@ -1265,17 +1265,17 @@ public void setViewportSize(int width, int height) { @Override public void tap(String selector, TapOptions options) { - mainFrame.tapImpl(selector, convertType(options, Frame.TapOptions.class)); + mainFrame.tap(selector, convertType(options, Frame.TapOptions.class)); } @Override public String textContent(String selector, TextContentOptions options) { - return mainFrame.textContentImpl(selector, convertType(options, Frame.TextContentOptions.class)); + return mainFrame.textContent(selector, convertType(options, Frame.TextContentOptions.class)); } @Override public String title() { - return mainFrame.titleImpl(); + return mainFrame.title(); } @Override @@ -1285,12 +1285,12 @@ public Touchscreen touchscreen() { @Override public void type(String selector, String text, TypeOptions options) { - mainFrame.typeImpl(selector, text, convertType(options, Frame.TypeOptions.class)); + mainFrame.type(selector, text, convertType(options, Frame.TypeOptions.class)); } @Override public void uncheck(String selector, UncheckOptions options) { - mainFrame.uncheckImpl(selector, convertType(options, Frame.UncheckOptions.class)); + mainFrame.uncheck(selector, convertType(options, Frame.UncheckOptions.class)); } @Override @@ -1366,7 +1366,7 @@ Waitable createWaitableTimeout(Double timeout) { @Override public JSHandle waitForFunction(String pageFunction, Object arg, WaitForFunctionOptions options) { - return mainFrame.waitForFunctionImpl(pageFunction, arg, convertType(options, Frame.WaitForFunctionOptions.class)); + return mainFrame.waitForFunction(pageFunction, arg, convertType(options, Frame.WaitForFunctionOptions.class)); } @Override @@ -1519,7 +1519,7 @@ private Response waitForResponseImpl(Predicate predicate, WaitForRespo @Override public ElementHandle waitForSelector(String selector, WaitForSelectorOptions options) { - return mainFrame.waitForSelectorImpl(selector, convertType(options, Frame.WaitForSelectorOptions.class)); + return mainFrame.waitForSelector(selector, convertType(options, Frame.WaitForSelectorOptions.class)); } @Override @@ -1533,7 +1533,7 @@ public void waitForCondition(BooleanSupplier predicate, WaitForConditionOptions @Override public void waitForTimeout(double timeout) { - mainFrame.waitForTimeoutImpl(timeout); + mainFrame.waitForTimeout(timeout); } @Override