Merge branch 'master' of https://github.com/appium/java-client into bidi

Author: mykola-mokhnach

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

@@ -35,6 +35,7 @@
 import org.openqa.selenium.bidi.BiDiException;
 import org.openqa.selenium.bidi.HasBiDi;
 import org.openqa.selenium.remote.CapabilityType;
+import org.openqa.selenium.remote.CommandInfo;
 import org.openqa.selenium.remote.DriverCommand;
 import org.openqa.selenium.remote.ErrorHandler;
 import org.openqa.selenium.remote.ExecuteMethod;
@@ -205,22 +206,23 @@ public Map<String, Object> getStatus() {
      * @param methodName The name of custom appium command.
      */
     public void addCommand(HttpMethod httpMethod, String url, String methodName) {
+        CommandInfo commandInfo;
         switch (httpMethod) {
             case GET:
-                MobileCommand.commandRepository.put(methodName, MobileCommand.getC(url));
+                commandInfo = MobileCommand.getC(url);
                 break;
             case POST:
-                MobileCommand.commandRepository.put(methodName, MobileCommand.postC(url));
+                commandInfo = MobileCommand.postC(url);
                 break;
             case DELETE:
-                MobileCommand.commandRepository.put(methodName, MobileCommand.deleteC(url));
+                commandInfo = MobileCommand.deleteC(url);
                 break;
             default:
                 throw new WebDriverException(String.format("Unsupported HTTP Method: %s. Only %s methods are supported",
                         httpMethod,
                         Arrays.toString(HttpMethod.values())));
         }
-        ((AppiumCommandExecutor) getCommandExecutor()).refreshAdditionalCommands();
+        ((AppiumCommandExecutor) getCommandExecutor()).defineCommand(methodName, commandInfo);
     }
 
     @Override

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

@@ -193,7 +193,11 @@ private Response createSession(Command command) throws IOException {
     }
 
     public void refreshAdditionalCommands() {
-        getAdditionalCommands().forEach(this::defineCommand);
+        getAdditionalCommands().forEach(super::defineCommand);
+    }
+
+    public void defineCommand(String commandName, CommandInfo info) {
+        super.defineCommand(commandName, info);
     }
 
     @SuppressWarnings("unchecked")