[java] Enhance error message for NoSuchElementException and return un…

…modifiable set for pinned scripts (#14707) Co-authored-by: Puja Jagani <[email protected]>
SeleniumHQ · Nov 5, 2024 · 4a0d05e · 4a0d05e
1 parent cd7303c
commit 4a0d05e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/java/src/org/openqa/selenium/By.java b/java/src/org/openqa/selenium/By.java
@@ -121,7 +121,7 @@ public static By cssSelector(String cssSelector) {
   public WebElement findElement(SearchContext context) {
     List<WebElement> allElements = findElements(context);
     if (allElements == null || allElements.isEmpty()) {
-      throw new NoSuchElementException("Cannot locate an element using " + toString());
+      throw new NoSuchElementException("Cannot locate an element using " + this);
     }
     return allElements.get(0);
   }

diff --git a/java/src/org/openqa/selenium/JavascriptExecutor.java b/java/src/org/openqa/selenium/JavascriptExecutor.java
@@ -17,7 +17,6 @@
 
 package org.openqa.selenium;
 
-import java.util.Collections;
 import java.util.Set;
 import java.util.stream.Collectors;
 import org.jspecify.annotations.NullMarked;
@@ -177,10 +176,9 @@ default void unpin(ScriptKey key) {
    * @return The {@link ScriptKey}s of all currently pinned scripts.
    */
   default Set<ScriptKey> getPinnedScripts() {
-    return Collections.unmodifiableSet(
-        UnpinnedScriptKey.getPinnedScripts(this).stream()
-            .map(key -> (ScriptKey) key)
-            .collect(Collectors.toSet()));
+    return UnpinnedScriptKey.getPinnedScripts(this).stream()
+        .map(key -> (ScriptKey) key)
+        .collect(Collectors.toUnmodifiableSet());
   }
 
   /**

diff --git a/java/src/org/openqa/selenium/support/pagefactory/ByAll.java b/java/src/org/openqa/selenium/support/pagefactory/ByAll.java
@@ -54,7 +54,7 @@ public WebElement findElement(SearchContext context) {
         return elements.get(0);
       }
     }
-    throw new NoSuchElementException("Cannot locate an element using " + toString());
+    throw new NoSuchElementException("Cannot locate an element using " + this);
   }
 
   @Override

diff --git a/java/src/org/openqa/selenium/support/pagefactory/ByChained.java b/java/src/org/openqa/selenium/support/pagefactory/ByChained.java
@@ -52,7 +52,7 @@ public ByChained(By... bys) {
   public WebElement findElement(SearchContext context) {
     List<WebElement> elements = findElements(context);
     if (elements.isEmpty())
-      throw new NoSuchElementException("Cannot locate an element using " + toString());
+      throw new NoSuchElementException("Cannot locate an element using " + this);
     return elements.get(0);
   }