Merge pull request #682 from TikhomirovSergey/w3c_compatibility_issue_fix

TikhomirovSergey · web-flow · commit e0e5ae029585 · 2017-08-05T09:40:27.000+03:00
#655 FIX
diff --git a/src/main/java/io/appium/java_client/AppiumDriver.java b/src/main/java/io/appium/java_client/AppiumDriver.java
@@ -42,6 +42,7 @@
 import org.openqa.selenium.remote.DriverCommand;
 import org.openqa.selenium.remote.ErrorHandler;
 import org.openqa.selenium.remote.ExecuteMethod;
+import org.openqa.selenium.remote.HttpCommandExecutor;
 import org.openqa.selenium.remote.Response;
 import org.openqa.selenium.remote.html5.RemoteLocationContext;
 import org.openqa.selenium.remote.http.HttpClient;
@@ -82,7 +83,7 @@ public class AppiumDriver<T extends WebElement>
      * @param capabilities take a look
      *                     at {@link org.openqa.selenium.Capabilities}
      */
-    public AppiumDriver(AppiumCommandExecutor executor, Capabilities capabilities) {
+    public AppiumDriver(HttpCommandExecutor executor, Capabilities capabilities) {
         super(executor, capabilities);
         this.executeMethod = new AppiumExecutionMethod(this);
         locationContext = new RemoteLocationContext(executeMethod);
diff --git a/src/main/java/io/appium/java_client/MobileCommand.java b/src/main/java/io/appium/java_client/MobileCommand.java
@@ -19,6 +19,7 @@
 import com.google.common.collect.ImmutableMap;
 
 import org.apache.commons.lang3.StringUtils;
+import org.openqa.selenium.remote.CommandInfo;
 import org.openqa.selenium.remote.http.HttpMethod;
 
 import java.time.Duration;
@@ -79,7 +80,7 @@ public class MobileCommand {
     protected static final String SET_SETTINGS;
     protected static final String GET_CURRENT_PACKAGE;
 
-    public static final  Map<String, AppiumCommandInfo> commandRepository;
+    public static final  Map<String, CommandInfo> commandRepository;
 
     static {
         RESET = "reset";
diff --git a/src/main/java/io/appium/java_client/android/AndroidDriver.java b/src/main/java/io/appium/java_client/android/AndroidDriver.java
@@ -24,12 +24,12 @@
 import io.appium.java_client.CommandExecutionHelper;
 import io.appium.java_client.FindsByAndroidUIAutomator;
 import io.appium.java_client.PressesKeyCode;
-import io.appium.java_client.remote.AppiumCommandExecutor;
 import io.appium.java_client.remote.MobilePlatform;
 import io.appium.java_client.service.local.AppiumDriverLocalService;
 import io.appium.java_client.service.local.AppiumServiceBuilder;
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.WebElement;
+import org.openqa.selenium.remote.HttpCommandExecutor;
 import org.openqa.selenium.remote.http.HttpClient;
 
 import java.net.URL;
@@ -58,7 +58,7 @@ public class AndroidDriver<T extends WebElement>
      * @param capabilities take a look
      *                     at {@link org.openqa.selenium.Capabilities}
      */
-    public AndroidDriver(AppiumCommandExecutor executor, Capabilities capabilities) {
+    public AndroidDriver(HttpCommandExecutor executor, Capabilities capabilities) {
         super(executor, substituteMobilePlatform(capabilities, ANDROID_PLATFORM));
     }
 
diff --git a/src/main/java/io/appium/java_client/ios/IOSDriver.java b/src/main/java/io/appium/java_client/ios/IOSDriver.java
@@ -24,14 +24,14 @@
 import io.appium.java_client.FindsByIosNSPredicate;
 import io.appium.java_client.FindsByIosUIAutomation;
 import io.appium.java_client.HidesKeyboardWithKeyName;
-import io.appium.java_client.remote.AppiumCommandExecutor;
 import io.appium.java_client.remote.MobilePlatform;
 import io.appium.java_client.service.local.AppiumDriverLocalService;
 import io.appium.java_client.service.local.AppiumServiceBuilder;
 import org.openqa.selenium.Alert;
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.remote.DriverCommand;
+import org.openqa.selenium.remote.HttpCommandExecutor;
 import org.openqa.selenium.remote.Response;
 import org.openqa.selenium.remote.http.HttpClient;
 import org.openqa.selenium.security.Credentials;
@@ -64,7 +64,7 @@ public class IOSDriver<T extends WebElement>
      * @param capabilities take a look
      *                     at {@link org.openqa.selenium.Capabilities}
      */
-    public IOSDriver(AppiumCommandExecutor executor, Capabilities capabilities) {
+    public IOSDriver(HttpCommandExecutor executor, Capabilities capabilities) {
         super(executor, substituteMobilePlatform(capabilities, IOS_PLATFORM));
     }
 
diff --git a/src/main/java/io/appium/java_client/remote/AppiumCommandExecutor.java b/src/main/java/io/appium/java_client/remote/AppiumCommandExecutor.java
@@ -17,169 +17,95 @@
 package io.appium.java_client.remote;
 
 import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Throwables.getRootCause;
 import static com.google.common.base.Throwables.throwIfUnchecked;
-import static org.openqa.selenium.remote.DriverCommand.GET_ALL_SESSIONS;
-import static org.openqa.selenium.remote.DriverCommand.NEW_SESSION;
-import static org.openqa.selenium.remote.DriverCommand.QUIT;
-
-import io.appium.java_client.AppiumCommandInfo;
-import org.openqa.selenium.NoSuchSessionException;
-import org.openqa.selenium.SessionNotCreatedException;
-import org.openqa.selenium.UnsupportedCommandException;
+import static java.util.Optional.ofNullable;
+
+import com.google.common.base.Supplier;
+import com.google.common.base.Throwables;
+
 import org.openqa.selenium.WebDriverException;
 import org.openqa.selenium.remote.Command;
-import org.openqa.selenium.remote.CommandCodec;
-import org.openqa.selenium.remote.CommandExecutor;
-import org.openqa.selenium.remote.Dialect;
+import org.openqa.selenium.remote.CommandInfo;
 import org.openqa.selenium.remote.DriverCommand;
-import org.openqa.selenium.remote.HttpSessionId;
+import org.openqa.selenium.remote.HttpCommandExecutor;
 import org.openqa.selenium.remote.Response;
-import org.openqa.selenium.remote.ResponseCodec;
 import org.openqa.selenium.remote.http.HttpClient;
-import org.openqa.selenium.remote.http.HttpRequest;
-import org.openqa.selenium.remote.http.HttpResponse;
 import org.openqa.selenium.remote.internal.ApacheHttpClient;
 import org.openqa.selenium.remote.service.DriverService;
 
 import java.io.IOException;
 import java.net.ConnectException;
 import java.net.URL;
 import java.util.Map;
+import java.util.Optional;
 
-public class AppiumCommandExecutor implements CommandExecutor {
-
-    private final URL remoteServer;
-    private final HttpClient client;
-    private final Map<String, AppiumCommandInfo> additionalCommands;
-    private CommandCodec<HttpRequest> commandCodec;
-    private ResponseCodec<HttpResponse> responseCodec;
-    private DriverService service;
-
-    /**
-     * Cretes an instance that sends requests and receives responses.
-     * 
-     * @param additionalCommands is the mapped command repository
-     * @param addressOfRemoteServer is the url to connect to the Appium remote/local server
-     * @param httpClientFactory is the http client factory
-     */
-    public AppiumCommandExecutor(Map<String, AppiumCommandInfo> additionalCommands,
-        URL addressOfRemoteServer, HttpClient.Factory httpClientFactory) {
-        checkNotNull(addressOfRemoteServer);
-        remoteServer = addressOfRemoteServer;
-        this.additionalCommands = additionalCommands;
-        this.client = httpClientFactory.createClient(remoteServer);
-    }
+public class AppiumCommandExecutor extends HttpCommandExecutor {
 
-    public AppiumCommandExecutor(Map<String, AppiumCommandInfo> additionalCommands, DriverService service,
-        HttpClient.Factory httpClientFactory) {
-        this(additionalCommands, service.getUrl(), httpClientFactory);
-        this.service = service;
-    }
+    private final Optional<DriverService> serviceOptional;
 
-    public AppiumCommandExecutor(Map<String, AppiumCommandInfo> additionalCommands,
-        URL addressOfRemoteServer) {
-        this(additionalCommands, addressOfRemoteServer, new ApacheHttpClient.Factory());
+    private AppiumCommandExecutor(Map<String, CommandInfo> additionalCommands, DriverService service,
+                                  URL addressOfRemoteServer,
+                                  HttpClient.Factory httpClientFactory) {
+        super(additionalCommands,
+                ofNullable(service)
+                        .map(DriverService::getUrl)
+                        .orElse(addressOfRemoteServer), httpClientFactory);
+        serviceOptional = ofNullable(service);
     }
 
-    public AppiumCommandExecutor(Map<String, AppiumCommandInfo> additionalCommands,
-        DriverService service) {
-        this(additionalCommands, service, new ApacheHttpClient.Factory());
+    public AppiumCommandExecutor(Map<String, CommandInfo> additionalCommands, DriverService service,
+                                 HttpClient.Factory httpClientFactory) {
+        this(additionalCommands, checkNotNull(service), null, httpClientFactory);
     }
 
-    public URL getAddressOfRemoteServer() {
-        return remoteServer;
+    public AppiumCommandExecutor(Map<String, CommandInfo> additionalCommands,
+                                 URL addressOfRemoteServer, HttpClient.Factory httpClientFactory) {
+        this(additionalCommands, null, checkNotNull(addressOfRemoteServer), httpClientFactory);
     }
 
-    private Response doExecute(Command command) throws IOException, WebDriverException {
-        if (command.getSessionId() == null) {
-            if (QUIT.equals(command.getName())) {
-                return new Response();
-            }
-            if (!GET_ALL_SESSIONS.equals(command.getName())
-                    && !NEW_SESSION.equals(command.getName())) {
-                throw new NoSuchSessionException(
-                        "Session ID is null. Using WebDriver after calling quit()?");
-            }
-        }
-
-        if (NEW_SESSION.equals(command.getName())) {
-            if (commandCodec != null) {
-                throw new SessionNotCreatedException("Session already exists");
-            }
-            AppiumProtocolHandShake handshake = new AppiumProtocolHandShake();
-            AppiumProtocolHandShake.Result result = handshake.createSession(client, command);
-            Dialect dialect = result.getDialect();
-            commandCodec = dialect.getCommandCodec();
-
-            additionalCommands.forEach((key, value) -> {
-                checkNotNull(key);
-                checkNotNull(value);
-                commandCodec.defineCommand(key, value.getMethod(), value.getUrl());
-            } );
-
-            responseCodec = dialect.getResponseCodec();
-            return result.createResponse();
-        }
 
-        if (commandCodec == null || responseCodec == null) {
-            throw new WebDriverException(
-                    "No command or response codec has been defined. Unable to proceed");
-        }
+    public AppiumCommandExecutor(Map<String, CommandInfo> additionalCommands,
+                                 URL addressOfRemoteServer) {
+        this(additionalCommands, addressOfRemoteServer, new ApacheHttpClient.Factory());
+    }
 
-        HttpRequest httpRequest = commandCodec.encode(command);
-        try {
-            HttpResponse httpResponse = client.execute(httpRequest, true);
-
-            Response response = responseCodec.decode(httpResponse);
-            if (response.getSessionId() == null) {
-                if (httpResponse.getTargetHost() != null) {
-                    response.setSessionId(HttpSessionId.getSessionId(httpResponse.getTargetHost()));
-                } else {
-                    response.setSessionId(command.getSessionId().toString());
-                }
-            }
-            if (QUIT.equals(command.getName())) {
-                client.close();
-            }
-            return response;
-        } catch (UnsupportedCommandException e) {
-            if (e.getMessage() == null || "".equals(e.getMessage())) {
-                throw new UnsupportedOperationException(
-                        "No information from server. Command name was: " + command.getName(),
-                        e.getCause());
-            }
-            throw e;
-        }
+    public AppiumCommandExecutor(Map<String, CommandInfo> additionalCommands,
+                                 DriverService service) {
+        this(additionalCommands, service, new ApacheHttpClient.Factory());
     }
 
-    @Override public Response execute(Command command) throws IOException, WebDriverException {
-        if (DriverCommand.NEW_SESSION.equals(command.getName()) && service != null) {
-            service.start();
+    @Override public Response execute(Command command) throws WebDriverException {
+        if (DriverCommand.NEW_SESSION.equals(command.getName())) {
+            serviceOptional.ifPresent(driverService -> {
+                try {
+                    driverService.start();
+                } catch (IOException e) {
+                    throw new WebDriverException(e.getMessage(), e);
+                }
+            });
         }
 
         try {
-            return doExecute(command);
+            return super.execute(command);
         } catch (Throwable t) {
-            Throwable rootCause = getRootCause(t);
+            Throwable rootCause = Throwables.getRootCause(t);
             if (rootCause instanceof ConnectException
-                && rootCause.getMessage().contains("Connection refused")
-                && service != null) {
-                if (service.isRunning()) {
-                    throw new WebDriverException("The session is closed!", t);
-                }
-
-                if (!service.isRunning()) {
-                    throw new WebDriverException("The appium server has accidentally died!", t);
-                }
+                    && rootCause.getMessage().contains("Connection refused")) {
+                throw serviceOptional.map(service -> {
+                    if (service.isRunning()) {
+                        return new WebDriverException("The session is closed!", rootCause);
+                    }
+
+                    return new WebDriverException("The appium server has accidentally died!", rootCause);
+                }).orElseGet((Supplier<WebDriverException>) () ->
+                        new WebDriverException(rootCause.getMessage(), rootCause));
             }
             throwIfUnchecked(t);
             throw new WebDriverException(t);
         } finally {
-            if (DriverCommand.QUIT.equals(command.getName()) && service != null) {
-                service.stop();
+            if (DriverCommand.QUIT.equals(command.getName())) {
+                serviceOptional.ifPresent(DriverService::stop);
             }
         }
     }
-
-}
+}
diff --git a/src/main/java/io/appium/java_client/remote/AppiumProtocolHandShake.java b/src/main/java/io/appium/java_client/remote/AppiumProtocolHandShake.java
diff --git a/src/main/java/io/appium/java_client/windows/WindowsDriver.java b/src/main/java/io/appium/java_client/windows/WindowsDriver.java
