[java] Minor performance and style improvements of ExpectedConditions

Author: barancev

java/client/src/org/openqa/selenium/support/ui/ExpectedConditions.java

@@ -32,7 +32,6 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
-import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 /**
@@ -144,16 +143,13 @@ public String toString() {
    */
   public static ExpectedCondition<Boolean> urlMatches(final String regex) {
     return new ExpectedCondition<Boolean>() {
+      private final Pattern pattern = Pattern.compile(regex);
       private String currentUrl;
-      private Pattern pattern;
-      private Matcher matcher;
 
       @Override
       public Boolean apply(WebDriver driver) {
         currentUrl = driver.getCurrentUrl();
-        pattern = Pattern.compile(regex);
-        matcher = pattern.matcher(currentUrl);
-        return matcher.find();
+        return pattern.matcher(currentUrl).find();
       }
 
       @Override
@@ -881,7 +877,7 @@ public Boolean apply(WebDriver driver) {
       @Override
       public String toString() {
         return String.format("element found by %s to have value \"%s\". Current value: \"%s\"",
-          locator, value, currentValue);
+                             locator, value, currentValue);
       }
     };
   }
@@ -1051,8 +1047,8 @@ public Boolean apply(WebDriver driver) {
 
       @Override
       public String toString() {
-        return String.format(property + " to be \"%s\". Current " + property + ": \"%s\"", value,
-                             currentValue);
+        return String.format("DOM property '%s' to be '%s'. Current value: '%s'",
+                             property, value, currentValue);
       }
     };
   }
@@ -1079,8 +1075,8 @@ public Boolean apply(WebDriver driver) {
 
       @Override
       public String toString() {
-        return String.format(attribute + " to be \"%s\". Current " + attribute + ": \"%s\"", value,
-                             currentValue);
+        return String.format("DOM attribute '%s' to be '%s'. Current value: '%s'",
+                             attribute, value, currentValue);
       }
     };
   }
@@ -1110,8 +1106,8 @@ public Boolean apply(WebDriver driver) {
 
       @Override
       public String toString() {
-        return String.format(attribute + " to be \"%s\". Current " + attribute + ": \"%s\"", value,
-                             currentValue);
+        return String.format("Attribute or property '%s' to be '%s'. Current value: '%s'",
+                             attribute, value, currentValue);
       }
     };
   }
@@ -1132,8 +1128,8 @@ public static ExpectedCondition<Boolean> attributeContains(final WebElement elem
       @Override
       public Boolean apply(WebDriver driver) {
         return getAttributeOrCssValue(element, attribute)
-            .map(seen -> seen.contains(value))
-            .orElse(false);
+          .map(seen -> seen.contains(value))
+          .orElse(false);
       }
 
       @Override
@@ -1159,16 +1155,13 @@ public static ExpectedCondition<Boolean> attributeContains(final By locator,
       @Override
       public Boolean apply(WebDriver driver) {
         return getAttributeOrCssValue(driver.findElement(locator), attribute)
-            .map(seen -> seen.contains(value))
-            .orElse(false);
+          .map(seen -> seen.contains(value))
+          .orElse(false);
       }
 
       @Override
       public String toString() {
-        return String.format(
-          "value found by %s to contain \"%s\".",
-          locator,
-          value);
+        return String.format("value found by %s to contain \"%s\".", locator, value);
       }
     };
   }
@@ -1271,8 +1264,8 @@ public String toString() {
    * @return subelement
    */
   public static ExpectedCondition<WebElement> presenceOfNestedElementLocatedBy(
-      final By locator,
-      final By childLocator) {
+    final By locator, final By childLocator)
+  {
     return new ExpectedCondition<WebElement>() {
 
       @Override
@@ -1295,8 +1288,8 @@ public String toString() {
    * @return subelement
    */
   public static ExpectedCondition<WebElement> presenceOfNestedElementLocatedBy(
-    final WebElement element,
-    final By childLocator) {
+    final WebElement element, final By childLocator)
+  {
 
     return new ExpectedCondition<WebElement>() {
 
@@ -1321,8 +1314,8 @@ public String toString() {
    * @return subelement
    */
   public static ExpectedCondition<List<WebElement>> presenceOfNestedElementsLocatedBy(
-    final By parent,
-    final By childLocator) {
+    final By parent, final By childLocator)
+  {
     return new ExpectedCondition<List<WebElement>>() {
 
       @Override
@@ -1345,8 +1338,7 @@ public String toString() {
    * @param elements used to check their invisibility
    * @return Boolean true when all elements are not visible anymore
    */
-  public static ExpectedCondition<Boolean> invisibilityOfAllElements(
-    final WebElement... elements) {
+  public static ExpectedCondition<Boolean> invisibilityOfAllElements(final WebElement... elements) {
     return invisibilityOfAllElements(Arrays.asList(elements));
   }
 
@@ -1356,8 +1348,7 @@ public static ExpectedCondition<Boolean> invisibilityOfAllElements(
    * @param elements used to check their invisibility
    * @return Boolean true when all elements are not visible anymore
    */
-  public static ExpectedCondition<Boolean> invisibilityOfAllElements(
-    final List<WebElement> elements) {
+  public static ExpectedCondition<Boolean> invisibilityOfAllElements(final List<WebElement> elements) {
     return new ExpectedCondition<Boolean>() {
 
       @Override
@@ -1446,7 +1437,6 @@ public String toString() {
     };
   }
 
-
   /**
    * An expectation with the logical and condition of the given list of conditions.
    *
@@ -1484,7 +1474,6 @@ public String toString() {
     };
   }
 
-
   /**
    * An expectation to check if js executable.
    *