appium#594 FIX: The final commit

TikhomirovSergey · TikhomirovSergey · commit 4d062a580360 · 2017-03-11T01:59:02.000+03:00
- AppiumCommandInfo was added.
- constructors of AndroidDriver were changed.
diff --git a/src/main/java/io/appium/java_client/AppiumCommandInfo.java b/src/main/java/io/appium/java_client/AppiumCommandInfo.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.appium.java_client;
+
+import org.openqa.selenium.remote.CommandInfo;
+import org.openqa.selenium.remote.http.HttpMethod;
+
+public class AppiumCommandInfo extends CommandInfo {
+    private final String url;
+    private final HttpMethod method;
+
+    public AppiumCommandInfo(String url, HttpMethod method) {
+        super(url, method);
+        this.url = url;
+        this.method = method;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public HttpMethod getMethod() {
+        return method;
+    }
+}
diff --git a/src/main/java/io/appium/java_client/AppiumDriver.java b/src/main/java/io/appium/java_client/AppiumDriver.java
@@ -44,7 +44,6 @@
 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;
@@ -85,7 +84,7 @@ public class AppiumDriver<T extends WebElement>
      * @param capabilities take a look
      *                     at {@link org.openqa.selenium.Capabilities}
      */
-    public AppiumDriver(HttpCommandExecutor executor, Capabilities capabilities) {
+    public AppiumDriver(AppiumCommandExecutor 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,7 +19,6 @@
 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.util.AbstractMap;
@@ -77,7 +76,7 @@ public class MobileCommand {
     protected static final String GET_SETTINGS;
     protected static final String SET_SETTINGS;
 
-    public static final  Map<String, CommandInfo> commandRepository;
+    public static final  Map<String, AppiumCommandInfo> commandRepository;
 
     static {
         RESET = "reset";
@@ -184,8 +183,8 @@ public class MobileCommand {
      * @param url is the command URL
      * @return an instance of {@link org.openqa.selenium.remote.CommandInfo}
      */
-    public static CommandInfo getC(String url) {
-        return new CommandInfo(url, HttpMethod.GET);
+    public static AppiumCommandInfo getC(String url) {
+        return new AppiumCommandInfo(url, HttpMethod.GET);
     }
 
     /**
@@ -194,8 +193,8 @@ public static CommandInfo getC(String url) {
      * @param url is the command URL
      * @return an instance of {@link org.openqa.selenium.remote.CommandInfo}
      */
-    public static CommandInfo postC(String url) {
-        return new CommandInfo(url, HttpMethod.POST);
+    public static AppiumCommandInfo postC(String url) {
+        return new AppiumCommandInfo(url, HttpMethod.POST);
     }
 
     /**
@@ -204,8 +203,8 @@ public static CommandInfo postC(String url) {
      * @param url is the command URL
      * @return an instance of {@link org.openqa.selenium.remote.CommandInfo}
      */
-    public static CommandInfo deleteC(String url) {
-        return new CommandInfo(url, HttpMethod.DELETE);
+    public static AppiumCommandInfo deleteC(String url) {
+        return new AppiumCommandInfo(url, HttpMethod.DELETE);
     }
 
     /**
diff --git a/src/main/java/io/appium/java_client/android/AndroidDriver.java b/src/main/java/io/appium/java_client/android/AndroidDriver.java
@@ -25,12 +25,12 @@
 import io.appium.java_client.FindsByAndroidUIAutomator;
 import io.appium.java_client.PressesKeyCode;
 import io.appium.java_client.TouchAction;
+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;
@@ -59,7 +59,7 @@ public class AndroidDriver<T extends WebElement>
      * @param capabilities take a look
      *                     at {@link org.openqa.selenium.Capabilities}
      */
-    public AndroidDriver(HttpCommandExecutor executor, Capabilities capabilities) {
+    public AndroidDriver(AppiumCommandExecutor 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
@@ -23,14 +23,14 @@
 import io.appium.java_client.FindsByIosUIAutomation;
 import io.appium.java_client.HidesKeyboardWithKeyName;
 import io.appium.java_client.TouchAction;
+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;
@@ -61,7 +61,7 @@ public class IOSDriver<T extends WebElement>
      * @param capabilities take a look
      *                     at {@link org.openqa.selenium.Capabilities}
      */
-    public IOSDriver(HttpCommandExecutor executor, Capabilities capabilities) {
+    public IOSDriver(AppiumCommandExecutor executor, Capabilities capabilities) {
         super(executor, substituteMobilePlatform(capabilities, IOS_PLATFORM));
     }
 
diff --git a/src/main/java/io/appium/java_client/windows/WindowsDriver.java b/src/main/java/io/appium/java_client/windows/WindowsDriver.java
@@ -22,11 +22,11 @@
 import io.appium.java_client.FindsByWindowsAutomation;
 import io.appium.java_client.HidesKeyboardWithKeyName;
 import io.appium.java_client.PressesKeyCode;
+import io.appium.java_client.remote.AppiumCommandExecutor;
 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;
@@ -35,7 +35,7 @@ public class WindowsDriver<T extends WebElement>
         extends AppiumDriver<T> implements PressesKeyCode, HidesKeyboardWithKeyName,
         FindsByWindowsAutomation<T> {
 
-    public WindowsDriver(HttpCommandExecutor executor, Capabilities capabilities) {
+    public WindowsDriver(AppiumCommandExecutor executor, Capabilities capabilities) {
         super(executor, substituteMobilePlatform(capabilities, WINDOWS));
     }
 
