rename sharedSelectors to selectorsimpl

Author: Skn0tt

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

@@ -871,7 +871,7 @@ void didClose() {
     closingOrClosed = true;
     if (browser != null) {
       browser.contexts.remove(this);
-      browser.browserType.playwright.sharedSelectors.contextsForSelectors.remove(this);
+      browser.browserType.playwright.selectors.contextsForSelectors.remove(this);
     }
     listeners.notify(EventType.CLOSE, this);
   }

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

@@ -177,8 +177,8 @@ private BrowserContextImpl newContextImpl(NewContextOptions options) {
     if (options.acceptDownloads != null) {
       params.addProperty("acceptDownloads", options.acceptDownloads ? "accept" : "deny");
     }
-    params.add("selectorEngines", gson().toJsonTree(browserType.playwright.sharedSelectors.selectorEngines));
-    params.addProperty("testIdAttributeName", browserType.playwright.sharedSelectors.testIdAttributeName);
+    params.add("selectorEngines", gson().toJsonTree(browserType.playwright.selectors.selectorEngines));
+    params.addProperty("testIdAttributeName", browserType.playwright.selectors.testIdAttributeName);
     JsonElement result = sendMessage("newContext", params);
     BrowserContextImpl context = connection.getExistingObject(result.getAsJsonObject().getAsJsonObject("context").get("guid").getAsString());
     context.initializeHarFromOptions(harOptions);
@@ -278,7 +278,7 @@ protected void connectToBrowserType(BrowserTypeImpl browserType, Path tracesDir)
 
     for (BrowserContextImpl context : contexts) {
       context.tracing().setTracesDir(tracesDir);
-      browserType.playwright.sharedSelectors.contextsForSelectors.add(context);
+      browserType.playwright.selectors.contextsForSelectors.add(context);
     }
   }
 
@@ -289,7 +289,7 @@ private void didCreateContext(BrowserContextImpl context) {
     // and will be configured later in `ConnectToBrowserType`.
     if (browserType != null) {
       context.tracing().setTracesDir(tracePath);
-      browserType.playwright.sharedSelectors.contextsForSelectors.add(context);
+      browserType.playwright.selectors.contextsForSelectors.add(context);
     }
   }
 

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

@@ -101,7 +101,7 @@ private Browser connectImpl(String wsEndpoint, ConnectOptions options) {
       }
       throw new PlaywrightException("Malformed endpoint. Did you use launchServer method?");
     }
-    playwright.sharedSelectors = this.playwright.sharedSelectors;
+    playwright.selectors = this.playwright.selectors;
     BrowserImpl browser = connection.getExistingObject(playwright.initializer.getAsJsonObject("preLaunchedBrowser").get("guid").getAsString());
     browser.isConnectedOverWebSocket = true;
     browser.connectToBrowserType(this, null);
@@ -201,8 +201,8 @@ private BrowserContextImpl launchPersistentContextImpl(Path userDataDir, LaunchP
     if (options.acceptDownloads != null) {
       params.addProperty("acceptDownloads", options.acceptDownloads ? "accept" : "deny");
     }
-    params.add("selectorEngines", gson().toJsonTree(playwright.sharedSelectors.selectorEngines));
-    params.addProperty("testIdAttributeName", playwright.sharedSelectors.testIdAttributeName);
+    params.add("selectorEngines", gson().toJsonTree(playwright.selectors.selectorEngines));
+    params.addProperty("testIdAttributeName", playwright.selectors.testIdAttributeName);
     JsonObject json = sendMessage("launchPersistentContext", params).getAsJsonObject();
     BrowserImpl browser = connection.getExistingObject(json.getAsJsonObject("browser").get("guid").getAsString());
     browser.connectToBrowserType(this, options.tracesDir);

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

@@ -44,8 +44,7 @@ static String describeSelector(String description) {
   }
 
   static String getByTestIdSelector(Object testId, PlaywrightImpl playwright) {
-    String testIdAttributeName = ((SharedSelectors) playwright.selectors()).testIdAttributeName;
-    return getByAttributeTextSelector(testIdAttributeName, testId, true);
+    return getByAttributeTextSelector(playwright.selectors.testIdAttributeName, testId, true);
   }
 
   static String getByAltTextSelector(Object text, Locator.GetByAltTextOptions options) {

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

@@ -62,7 +62,7 @@ public static PlaywrightImpl createImpl(CreateOptions options, boolean forceNewD
   private final BrowserTypeImpl firefox;
   private final BrowserTypeImpl webkit;
   private final APIRequestImpl apiRequest;
-  protected SharedSelectors sharedSelectors;
+  protected SelectorsImpl selectors;
 
   PlaywrightImpl(ChannelOwner parent, String type, String guid, JsonObject initializer) {
     super(parent, type, guid, initializer);
@@ -74,7 +74,7 @@ public static PlaywrightImpl createImpl(CreateOptions options, boolean forceNewD
     firefox.playwright = this;
     webkit.playwright = this;
 
-    sharedSelectors = new SharedSelectors();
+    selectors = new SelectorsImpl();
     apiRequest = new APIRequestImpl(this);
   }
 
@@ -108,7 +108,7 @@ public BrowserTypeImpl webkit() {
 
   @Override
   public Selectors selectors() {
-    return sharedSelectors;
+    return selectors;
   }
 
   @Override

…oft/playwright/impl/SharedSelectors.java …osoft/playwright/impl/SelectorsImpl.javaplaywright/src/main/java/com/microsoft/playwright/impl/SharedSelectors.java renamed to playwright/src/main/java/com/microsoft/playwright/impl/SelectorsImpl.java playwright/src/main/java/com/microsoft/playwright/impl/SharedSelectors.java renamed to playwright/src/main/java/com/microsoft/playwright/impl/SelectorsImpl.java

@@ -28,7 +28,7 @@
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
-public class SharedSelectors extends LoggingSupport implements Selectors {
+public class SelectorsImpl extends LoggingSupport implements Selectors {
   protected final List<BrowserContextImpl> contextsForSelectors = new ArrayList<>();
   protected final List<JsonObject> selectorEngines = new ArrayList<>();