CR

Author: panchenko

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

@@ -58,8 +58,6 @@ public class AppiumCommandExecutor extends HttpCommandExecutor {
 
     private final Optional<DriverService> serviceOptional;
     @Getter
-    private final Factory httpClientFactory;
-    @Getter
     private final AppiumClientConfig appiumClientConfig;
 
     /**
@@ -81,7 +79,6 @@ public AppiumCommandExecutor(
         );
         serviceOptional = ofNullable(service);
 
-        this.httpClientFactory = ofNullable(httpClientFactory).orElseGet(HttpCommandExecutor::getDefaultClientFactory);
         this.appiumClientConfig = appiumClientConfig;
     }
 
@@ -141,6 +138,10 @@ public Map<String, CommandInfo> getAdditionalCommands() {
         return getPrivateFieldValue(HttpCommandExecutor.class, "additionalCommands", Map.class);
     }
 
+    public Factory getHttpClientFactory() {
+        return getPrivateFieldValue(HttpCommandExecutor.class, "httpClientFactory", Factory.class);
+    }
+
     @Nullable
     protected CommandCodec<HttpRequest> getCommandCodec() {
         return this.commandCodec;
@@ -165,8 +166,8 @@ protected HttpClient getClient() {
      * @param serverUrl A url to override.
      */
     protected void overrideServerUrl(URL serverUrl) {
-        setPrivateFieldValue(HttpCommandExecutor.class, "client",
-                this.httpClientFactory.createClient(this.appiumClientConfig.baseUrl(serverUrl)));
+        HttpClient newClient = getHttpClientFactory().createClient(appiumClientConfig.baseUrl(serverUrl));
+        setPrivateFieldValue(HttpCommandExecutor.class, "client", newClient);
     }
 
     private Response createSession(Command command) throws IOException {

src/test/java/io/appium/java_client/remote/AppiumCommandExecutorTest.java

@@ -0,0 +1,40 @@
+package io.appium.java_client.remote;
+
+import io.appium.java_client.AppiumClientConfig;
+import io.appium.java_client.MobileCommand;
+import java.net.MalformedURLException;
+import java.net.URL;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+class AppiumCommandExecutorTest {
+    private static final String APPIUM_URL = "https://appium.exaple.com";
+
+    private AppiumCommandExecutor createExecutor() {
+        URL baseUrl;
+        try {
+            baseUrl = new URL(APPIUM_URL);
+        } catch (MalformedURLException e) {
+            throw new AssertionError(e);
+        }
+        AppiumClientConfig clientConfig = AppiumClientConfig.defaultConfig().baseUrl(baseUrl);
+        return new AppiumCommandExecutor(MobileCommand.commandRepository, clientConfig);
+    }
+
+    @Test
+    void getAdditionalCommands() {
+        assertNotNull(createExecutor().getAdditionalCommands());
+    }
+
+    @Test
+    void getHttpClientFactory() {
+        assertNotNull(createExecutor().getHttpClientFactory());
+    }
+
+    @Test
+    void overrideServerUrl() {
+        assertDoesNotThrow(() -> createExecutor().overrideServerUrl(new URL("https://direct.example.com")));
+    }
+}