Merge pull request #100 from ricekot/updates

Update add-on APIs

Author: psiinon

CHANGELOG.md

@@ -5,7 +5,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Changed
+- Update the APIs of the following add-ons:
+  - Automation Framework version 0.15.0;
+  - Selenium version 15.8.0;
 
+### Fixed 
+- Add a graphql object to ClientApi.
 
 ## [1.10.0] - 2021-10-11
 ### Added

subprojects/zap-clientapi/src/main/java/org/zaproxy/clientapi/core/ClientApi.java

@@ -61,6 +61,7 @@
 import org.zaproxy.clientapi.gen.Core;
 import org.zaproxy.clientapi.gen.Exportreport;
 import org.zaproxy.clientapi.gen.ForcedUser;
+import org.zaproxy.clientapi.gen.Graphql;
 import org.zaproxy.clientapi.gen.HttpSessions;
 import org.zaproxy.clientapi.gen.ImportLogFiles;
 import org.zaproxy.clientapi.gen.Importurls;
@@ -120,6 +121,7 @@ public class ClientApi {
     public Core core = new Core(this);
     public Exportreport exportreport = new Exportreport(this);
     public ForcedUser forcedUser = new ForcedUser(this);
+    public Graphql graphql = new Graphql(this);
     public HttpSessions httpSessions = new HttpSessions(this);
     public ImportLogFiles logImportFiles = new ImportLogFiles(this);
     public Importurls importurls = new Importurls(this);

subprojects/zap-clientapi/src/main/java/org/zaproxy/clientapi/gen/Automation.java

@@ -48,4 +48,9 @@ public ApiResponse runPlan(String filepath) throws ClientApiException {
         map.put("filePath", filepath);
         return api.callApi("automation", "action", "runPlan", map);
     }
+
+    /** This component is optional and therefore the API will only work if it is installed */
+    public ApiResponse endDelayJob() throws ClientApiException {
+        return api.callApi("automation", "action", "endDelayJob", null);
+    }
 }

subprojects/zap-clientapi/src/main/java/org/zaproxy/clientapi/gen/Selenium.java

@@ -36,6 +36,20 @@ public Selenium(ClientApi api) {
         this.api = api;
     }
 
+    /** This component is optional and therefore the API will only work if it is installed */
+    public ApiResponse optionBrowserExtensions() throws ClientApiException {
+        return api.callApi("selenium", "view", "optionBrowserExtensions", null);
+    }
+
+    /**
+     * Returns the current path to Chrome binary
+     *
+     * <p>This component is optional and therefore the API will only work if it is installed
+     */
+    public ApiResponse optionChromeBinaryPath() throws ClientApiException {
+        return api.callApi("selenium", "view", "optionChromeBinaryPath", null);
+    }
+
     /**
      * Returns the current path to ChromeDriver
      *
@@ -69,6 +83,11 @@ public ApiResponse optionIeDriverPath() throws ClientApiException {
         return api.callApi("selenium", "view", "optionIeDriverPath", null);
     }
 
+    /** This component is optional and therefore the API will only work if it is installed */
+    public ApiResponse optionLastDirectory() throws ClientApiException {
+        return api.callApi("selenium", "view", "optionLastDirectory", null);
+    }
+
     /**
      * Returns the current path to PhantomJS binary
      *
@@ -78,6 +97,17 @@ public ApiResponse optionPhantomJsBinaryPath() throws ClientApiException {
         return api.callApi("selenium", "view", "optionPhantomJsBinaryPath", null);
     }
 
+    /**
+     * Sets the current path to Chrome binary
+     *
+     * <p>This component is optional and therefore the API will only work if it is installed
+     */
+    public ApiResponse setOptionChromeBinaryPath(String string) throws ClientApiException {
+        Map<String, String> map = new HashMap<>();
+        map.put("String", string);
+        return api.callApi("selenium", "action", "setOptionChromeBinaryPath", map);
+    }
+
     /**
      * Sets the current path to ChromeDriver
      *
@@ -119,6 +149,13 @@ public ApiResponse setOptionIeDriverPath(String string) throws ClientApiExceptio
         return api.callApi("selenium", "action", "setOptionIeDriverPath", map);
     }
 
+    /** This component is optional and therefore the API will only work if it is installed */
+    public ApiResponse setOptionLastDirectory(String string) throws ClientApiException {
+        Map<String, String> map = new HashMap<>();
+        map.put("String", string);
+        return api.callApi("selenium", "action", "setOptionLastDirectory", map);
+    }
+
     /**
      * Sets the current path to PhantomJS binary
      *