[java] Adding a bit of Java 8 flavor

Author: barancev

java/client/src/org/openqa/selenium/support/pagefactory/ByChained.java

@@ -25,6 +25,8 @@
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * Mechanism used to locate elements within a document using a series of other lookups.  This class
@@ -66,28 +68,21 @@ public List<WebElement> findElements(SearchContext context) {
       if (elems.isEmpty()) {
         break; // if any one of the bys finds no elements, then return no elements
       }
-      List<WebElement> newElems = new ArrayList<>();
-      for (WebElement elem : elems) {
-        newElems.addAll(elem.findElements(bys[i]));
-      }
-      elems = newElems;
+      final By by = bys[i];
+      elems = elems.stream()
+        .map(elem -> elem.findElements(by))
+        .flatMap(List::stream)
+        .collect(Collectors.toList());
     }
 
     return elems;
   }
 
   @Override
   public String toString() {
-    StringBuilder stringBuilder = new StringBuilder("By.chained(");
-    stringBuilder.append("{");
-
-    boolean first = true;
-    for (By by : bys) {
-      stringBuilder.append((first ? "" : ",")).append(by);
-      first = false;
-    }
-    stringBuilder.append("})");
-    return stringBuilder.toString();
+    return String.format(
+      "By.chained({%s})",
+      Stream.of(bys).map(By::toString).collect(Collectors.joining(",")));
   }
 
 }

java/client/test/org/openqa/selenium/support/pagefactory/ByChainedTest.java

@@ -48,7 +48,7 @@ public void findElementZeroBy() {
 
     ByChained by = new ByChained();
     assertThatExceptionOfType(NoSuchElementException.class)
-        .isThrownBy(() -> by.findElement(driver));
+      .isThrownBy(() -> by.findElement(driver));
   }
 
   @Test
@@ -98,7 +98,7 @@ public void findElementOneByEmpty() {
 
     ByChained by = new ByChained(By.name("cheese"));
     assertThatExceptionOfType(NoSuchElementException.class)
-        .isThrownBy(() -> by.findElement(driver));
+      .isThrownBy(() -> by.findElement(driver));
   }
 
   @Test
@@ -166,7 +166,7 @@ public void findElementTwoByEmptyParent() {
 
     ByChained by = new ByChained(By.name("cheese"), By.name("photo"));
     assertThatExceptionOfType(NoSuchElementException.class)
-        .isThrownBy(() -> by.findElement(driver));
+      .isThrownBy(() -> by.findElement(driver));
   }
 
   @Test
@@ -299,7 +299,13 @@ public void findElementThreeBy_firstFindsTwo_secondEmpty() {
   @Test
   public void testEquals() {
     assertThat(new ByChained(By.id("cheese"), By.name("photo")))
-        .isEqualTo(new ByChained(By.id("cheese"), By.name("photo")));
+      .isEqualTo(new ByChained(By.id("cheese"), By.name("photo")));
+  }
+
+  @Test
+  public void testToString() {
+    assertThat(new ByChained(By.id("cheese"), By.name("photo")).toString())
+      .isEqualTo("By.chained({By.id: cheese,By.name: photo})");
   }
 
   private interface AllDriver extends SearchContext {