Fix JsonableMap

Author: SMadani

README.md

@@ -112,6 +112,25 @@ the dependency co-ordinates and add `mavenLocal()` to the `repositories` block i
 * For a searchable list of code snippets examples, see [**SNIPPETS.md**](https://github.com/Vonage/vonage-java-code-snippets/blob/main/SNIPPETS.md).
 * For Video API usage instructions, see [the guide on our developer portal](https://developer.vonage.com/en/video/server-sdks/java).
 
+### Custom Requests
+Beginning with v9.1.0, you can now make customisable requests to any Vonage API endpoint using the `CustomClient` class,
+obtained from the `VonageClient#getCustomClient()` method. This will take care of auth and serialisation for you.
+You can use existing data models from the SDK or create your own by extending `com.vonage.client.JsonableBaseObject`
+or implementing the `com.vonage.client.Jsonable` interface. For example, you can check your account balance using
+the following code, which will send a `get` request to the specified URL and return a `BalanceResponse` object:
+
+```java
+BalanceResponse response = client.getCustomClient().get("https://rest.nexmo.com/account/get-balance");
+```
+
+You can also parse the response into a `Map<String, ?>` which represents the JSON response body as a tree like so:
+
+```java
+Map<String, ?> response = client.getCustomClient().getJson("https://api-eu.vonage.com/v3/media?order=ascending&page_size=50");
+```
+
+The same applies for POST, PUT and PATCH requests when sending data.
+
 ## Configuration
 
 ## Typical Instantiation

src/main/java/com/vonage/client/CustomClient.java

@@ -44,28 +44,8 @@ public class CustomClient {
     /**
      * Wrapper for converting Map to JSON and vice versa.
      */
-    static final class JsonableMap implements Jsonable {
-        private Map<String, ?> body;
-
-        /**
-         * Gets the body of the request.
-         *
-         * @return The request body as a Map.
-         */
-        @JsonAnyGetter
-        Map<String, ?> getBody() {
-            return body;
-        }
-
-        /**
-         * Sets the body of the request.
-         *
-         * @param body The request body as a Map.
-         */
-        @JsonAnySetter
-        public void setBody(Map<String, ?> body) {
-            this.body = body;
-        }
+    static final class JsonableMap extends JsonableBaseObject {
+        @JsonAnyGetter @JsonAnySetter Map<String, Object> body;
     }
 
     /**
@@ -196,11 +176,11 @@ public <R> R patch(String url, Jsonable requestBody, R... responseType) {
      * @return The response body converted from JSON into a Map.
      * @throws VonageApiResponseException If the HTTP response code is >= 400.
      */
-    public Map<String, ?> postJson(String url, Map<String, ?> requestBody) {
+    public Map<String, ?> postJson(String url, Map<String, Object> requestBody) {
         JsonableMap map = new JsonableMap();
-        map.setBody(requestBody);
+        map.body = requestBody;
         map = post(url, map);
-        return map.getBody();
+        return map.body;
     }
 
     /**
@@ -213,7 +193,7 @@ public <R> R patch(String url, Jsonable requestBody, R... responseType) {
      */
     public Map<String, ?> getJson(String url) {
         JsonableMap map = get(url);
-        return map.getBody();
+        return map.body;
     }
 
     /**
@@ -225,11 +205,11 @@ public <R> R patch(String url, Jsonable requestBody, R... responseType) {
      * @return The response body converted from JSON into a Map.
      * @throws VonageApiResponseException If the HTTP response code is >= 400.
      */
-    public Map<String, ?> putJson(String url, Map<String, ?> requestBody) {
+    public Map<String, ?> putJson(String url, Map<String, Object> requestBody) {
         JsonableMap map = new JsonableMap();
-        map.setBody(requestBody);
+        map.body = requestBody;
         map = put(url, map);
-        return map.getBody();
+        return map.body;
     }
 
     /**
@@ -241,10 +221,10 @@ public <R> R patch(String url, Jsonable requestBody, R... responseType) {
      * @return The response body converted from JSON into a Map.
      * @throws VonageApiResponseException If the HTTP response code is >= 400.
      */
-    public Map<String, ?> patchJson(String url, Map<String, ?> requestBody) {
+    public Map<String, ?> patchJson(String url, Map<String, Object> requestBody) {
         JsonableMap map = new JsonableMap();
-        map.setBody(requestBody);
+        map.body = requestBody;
         map = patch(url, map);
-        return map.getBody();
+        return map.body;
     }
 }