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

Author: barancev

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

@@ -141,7 +141,7 @@ public String toString() {
 
   public static ExpectedCondition<Point> elementLocationToBe(
       final WebElement element, final Point expectedLocation) {
-    return new ExpectedCondition<String>() {
+    return new ExpectedCondition<Point>() {
       private Point currentLocation = new Point(0, 0);
 
       @Override

java/client/test/org/openqa/selenium/atoms/InputAtomsTest.java

@@ -41,7 +41,7 @@ public class InputAtomsTest {
   @Test
   public void exportsTheExpectedNames() throws IOException {
     final String source = JavaScriptLoader.loadResource(RESOURCE_PATH);
-    ContextFactory.getGlobal().call(new ContextAction<>() {
+    ContextFactory.getGlobal().call(new ContextAction<Object>() {
       private ScriptableObject global;
 
       @Override

java/client/test/org/openqa/selenium/interactions/BasicMouseInterfaceTest.java

@@ -493,7 +493,7 @@ private boolean fuzzyPositionMatching(int expectedX, int expectedY, String locat
 
   private ExpectedCondition<Boolean> fuzzyMatchingOfCoordinates(
       final WebElement element, final int x, final int y) {
-    return new ExpectedCondition<>() {
+    return new ExpectedCondition<Boolean>() {
       @Override
       public Boolean apply(WebDriver ignored) {
         return fuzzyPositionMatching(x, y, element.getText());

java/client/test/org/openqa/selenium/support/ui/FluentWaitTest.java

@@ -196,7 +196,7 @@ public void timeoutMessageIncludesToStringOfCondition() {
         "Expected condition failed: waiting for toString called "
         + "(tried for 0 second(s) with 500 milliseconds interval)");
 
-    Function<Object, Boolean> condition = new Function<>() {
+    Function<Object, Boolean> condition = new Function<Object, Boolean>() {
       @Override
       public Boolean apply(Object ignored) {
         return false;
@@ -241,7 +241,7 @@ public void callsDeprecatedHandlerForRuntimeExceptions() {
     when(mockCondition.apply(mockDriver)).thenThrow(exception);
 
     final TestException sentinelException = new TestException();
-    FluentWait<WebDriver> wait = new FluentWait<>(mockDriver, mockClock, mockSleeper) {
+    FluentWait<WebDriver> wait = new FluentWait<WebDriver>(mockDriver, mockClock, mockSleeper) {
       @Override
       protected RuntimeException timeoutException(String message, Throwable lastException) {
         throw sentinelException;