Added the same capability for the constructors with localservice and builder parameters as suggested by Tikhomirov Sergey

Author: baechul Kim

src/main/java/io/appium/java_client/AppiumDriver.java

@@ -157,40 +157,50 @@ protected static ImmutableMap<String, Object> getCommandImmutableMap(
 		return builder.build();
 	}
 
-    private AppiumDriver(CommandExecutor executor, Capabilities capabilities){
+    private AppiumDriver(HttpCommandExecutor executor, Capabilities capabilities){
         super(executor, capabilities);
         this.executeMethod = new AppiumExecutionMethod(this);
         locationContext = new RemoteLocationContext(executeMethod);
         super.setErrorHandler(errorHandler);
+        this.remoteAddress = executor.getAddressOfRemoteServer();
     }
 
     public AppiumDriver(URL remoteAddress, Capabilities desiredCapabilities) {
         this(new AppiumCommandExecutor(
                 getMobileCommands(), remoteAddress), desiredCapabilities);
-        this.remoteAddress = remoteAddress;
     }
 
     public AppiumDriver(URL remoteAddress, HttpClient.Factory httpClientFactory, Capabilities desiredCapabilities) {
         this(new AppiumCommandExecutor(
                 getMobileCommands(), remoteAddress, httpClientFactory), desiredCapabilities);
-        this.remoteAddress = remoteAddress;
     }
 
     public AppiumDriver(AppiumDriverLocalService service, Capabilities desiredCapabilities) {
         this(new AppiumCommandExecutor(
                 getMobileCommands(), service), desiredCapabilities);
-        this.remoteAddress = service.getUrl();
+    }
+    
+    public AppiumDriver(AppiumDriverLocalService service, HttpClient.Factory httpClientFactory, Capabilities desiredCapabilities) {
+        this(new AppiumCommandExecutor(
+                getMobileCommands(), service, httpClientFactory), desiredCapabilities);
     }
 
     public AppiumDriver(AppiumServiceBuilder builder, Capabilities desiredCapabilities) {
         this(builder.build(), desiredCapabilities);
     }
-
+    
+    public AppiumDriver(AppiumServiceBuilder builder, HttpClient.Factory httpClientFactory, Capabilities desiredCapabilities) {
+        this(builder.build(), httpClientFactory, desiredCapabilities);
+    }
+    
+    public AppiumDriver(HttpClient.Factory httpClientFactory, Capabilities desiredCapabilities) {
+        this(AppiumDriverLocalService.buildDefaultService(), httpClientFactory, desiredCapabilities);
+    }
+    
     public AppiumDriver(Capabilities desiredCapabilities) {
         this(AppiumDriverLocalService.buildDefaultService(), desiredCapabilities);
     }
 
-
 	@Override
 	protected Response execute(String command) {
 		return super.execute(command, ImmutableMap.<String, Object>of());

src/main/java/io/appium/java_client/android/AndroidDriver.java

@@ -94,13 +94,31 @@ public AndroidDriver(AppiumDriverLocalService service, Capabilities desiredCapab
                 ANDROID_PLATFORM));
         this.setElementConverter(new JsonToAndroidElementConverter(this));
     }
+    
+    public AndroidDriver(AppiumDriverLocalService service, HttpClient.Factory httpClientFactory, Capabilities desiredCapabilities) {
+        super(service, httpClientFactory, substituteMobilePlatform(desiredCapabilities, 
+                ANDROID_PLATFORM));
+        this.setElementConverter(new JsonToAndroidElementConverter(this));
+    }
 
     public AndroidDriver(AppiumServiceBuilder builder, Capabilities desiredCapabilities) {
         super(builder, substituteMobilePlatform(desiredCapabilities,
                 ANDROID_PLATFORM));
         this.setElementConverter(new JsonToAndroidElementConverter(this));
     }
-
+    
+    public AndroidDriver(AppiumServiceBuilder builder, HttpClient.Factory httpClientFactory, Capabilities desiredCapabilities) {
+        super(builder, httpClientFactory, substituteMobilePlatform(desiredCapabilities,
+                ANDROID_PLATFORM));
+        this.setElementConverter(new JsonToAndroidElementConverter(this));
+    }
+    
+    public AndroidDriver(HttpClient.Factory httpClientFactory, Capabilities desiredCapabilities) {
+        super(httpClientFactory, substituteMobilePlatform(desiredCapabilities,
+                ANDROID_PLATFORM));
+        this.setElementConverter(new JsonToAndroidElementConverter(this));
+    }
+    
     public AndroidDriver(Capabilities desiredCapabilities) {
         super(substituteMobilePlatform(desiredCapabilities,
                 ANDROID_PLATFORM));

src/main/java/io/appium/java_client/ios/IOSDriver.java

@@ -69,12 +69,30 @@ public IOSDriver(AppiumDriverLocalService service, Capabilities desiredCapabilit
                 IOS_PLATFORM));
         this.setElementConverter(new JsonToIOSElementConverter(this));
     }
+    
+    public IOSDriver(AppiumDriverLocalService service, HttpClient.Factory httpClientFactory, Capabilities desiredCapabilities) {
+        super(service, httpClientFactory, substituteMobilePlatform(desiredCapabilities,
+                IOS_PLATFORM));
+        this.setElementConverter(new JsonToIOSElementConverter(this));
+    }
 
     public IOSDriver(AppiumServiceBuilder builder, Capabilities desiredCapabilities) {
         super(builder, substituteMobilePlatform(desiredCapabilities,
                 IOS_PLATFORM));
         this.setElementConverter(new JsonToIOSElementConverter(this));
     }
+    
+    public IOSDriver(AppiumServiceBuilder builder, HttpClient.Factory httpClientFactory, Capabilities desiredCapabilities) {
+        super(builder, httpClientFactory, substituteMobilePlatform(desiredCapabilities,
+                IOS_PLATFORM));
+        this.setElementConverter(new JsonToIOSElementConverter(this));
+    }
+    
+    public IOSDriver(HttpClient.Factory httpClientFactory, Capabilities desiredCapabilities) {
+        super(httpClientFactory, substituteMobilePlatform(desiredCapabilities,
+                IOS_PLATFORM));
+        this.setElementConverter(new JsonToIOSElementConverter(this));
+    }
 
     public IOSDriver(Capabilities desiredCapabilities) {
         super(substituteMobilePlatform(desiredCapabilities,

src/main/java/io/appium/java_client/remote/AppiumCommandExecutor.java

@@ -27,25 +27,34 @@
 import java.net.ConnectException;
 import java.net.URL;
 import java.util.Map;
+import org.openqa.selenium.remote.internal.ApacheHttpClient;
 
 public class AppiumCommandExecutor extends HttpCommandExecutor{
 
     private final DriverService service;
 
-    public AppiumCommandExecutor(Map<String, CommandInfo> additionalCommands, URL addressOfRemoteServer, 
-            HttpClient.Factory httpClientFactory) {
+    public AppiumCommandExecutor(Map<String, CommandInfo> additionalCommands,
+                                 URL addressOfRemoteServer, 
+                                 HttpClient.Factory httpClientFactory) {
         super(additionalCommands, addressOfRemoteServer, httpClientFactory);
         service = null;
     }
 
-    public AppiumCommandExecutor(Map<String, CommandInfo> additionalCommands, URL addressOfRemoteServer) {
-        super(additionalCommands, addressOfRemoteServer);
-        service = null;
+    public AppiumCommandExecutor(Map<String, CommandInfo> additionalCommands, 
+                                 DriverService service,
+                                 HttpClient.Factory httpClientFactory) {
+        super(additionalCommands, service.getUrl(), httpClientFactory);
+        this.service = service;
+    }
+    
+    public AppiumCommandExecutor(Map<String, CommandInfo> additionalCommands, 
+                                 URL addressOfRemoteServer) {
+        this(additionalCommands, addressOfRemoteServer, new ApacheHttpClient.Factory());
     }
 
-    public AppiumCommandExecutor(Map<String, CommandInfo> additionalCommands, DriverService service) {
-        super(additionalCommands, service.getUrl());
-        this.service = service;
+    public AppiumCommandExecutor(Map<String, CommandInfo> additionalCommands, 
+                                 DriverService service) {
+        this(additionalCommands, service, new ApacheHttpClient.Factory());
     }
 
     @Override