remove withLogging

Author: Skn0tt

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) {

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) {

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

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<Cookie> 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<Cookie> cookies(List<String> urls) {
-    return withLogging("BrowserContext.cookies", () -> cookiesImpl(urls));
+    return cookiesImpl(urls);
   }
 
   private List<Cookie> cookiesImpl(List<String> urls) {
@@ -409,7 +405,7 @@ private List<Cookie> cookiesImpl(List<String> 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<String> permissions, GrantPermissionsOptions options) {
-    withLogging("BrowserContext.grantPermissions", () -> grantPermissionsImpl(permissions, options));
+    grantPermissionsImpl(permissions, options);
   }
 
   private void grantPermissionsImpl(List<String> permissions, GrantPermissionsOptions options) {
@@ -456,7 +451,7 @@ private void grantPermissionsImpl(List<String> 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<Route> 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<String> predicate, Consumer<WebSocketRoute>
   }
 
   private void routeWebSocketImpl(UrlMatcher matcher, Consumer<WebSocketRoute> 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<String, String> headers) {
-    withLogging("BrowserContext.setExtraHTTPHeaders", () -> {
-      JsonObject params = new JsonObject();
-      JsonArray jsonHeaders = new JsonArray();
-      for (Map.Entry<String, String> 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<String, String> 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<Route> handler) {
-    withLogging("BrowserContext.unroute", () -> {
-      routes.remove(matcher, handler);
-      updateInterceptionPatterns();
-    });
+    routes.remove(matcher, handler);
+    updateInterceptionPatterns();
   }
 
   private void updateInterceptionPatterns() {

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() {

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) {

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

@@ -82,13 +82,6 @@ <T> T withWaitLogging(String apiName, Function<Logger, T> code) {
     return new WaitForEventLogger<>(this, apiName, code).get();
   }
 
-  @Deprecated
-  @Override
-  <T> T withLogging(String apiName, Supplier<T> 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, () -> {