[java] Backing out more changes in tests that target Java 9

Author: barancev

java/client/test/org/openqa/selenium/WaitingConditions.java

@@ -78,7 +78,7 @@ boolean compareText(String expectedValue, String actualValue) {
   }
 
   public static ExpectedCondition<String> elementTextToEqual(final By locator, final String value) {
-    return new ExpectedCondition<>() {
+    return new ExpectedCondition<String>() {
 
       @Override
       public String apply(WebDriver driver) {
@@ -121,7 +121,7 @@ public String toString() {
   }
 
   public static ExpectedCondition<String> pageSourceToContain(final String expectedText) {
-    return new ExpectedCondition<>() {
+    return new ExpectedCondition<String>() {
       @Override
       public String apply(WebDriver driver) {
         String source = driver.getPageSource();
@@ -141,7 +141,7 @@ public String toString() {
 
   public static ExpectedCondition<Point> elementLocationToBe(
       final WebElement element, final Point expectedLocation) {
-    return new ExpectedCondition<>() {
+    return new ExpectedCondition<String>() {
       private Point currentLocation = new Point(0, 0);
 
       @Override
@@ -181,7 +181,7 @@ public static ExpectedCondition<String> newWindowIsOpened(final Set<String> orig
   }
 
   public static ExpectedCondition<WebDriver> windowToBeSwitchedToWithName(final String windowName) {
-    return new ExpectedCondition<>() {
+    return new ExpectedCondition<WebDriver>() {
 
       @Override
       public WebDriver apply(WebDriver driver) {