Update map type (#101)

castle · Jun 4, 2021 · ede1e1f · ede1e1f
1 parent cf809e1
commit ede1e1f
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 24 deletions.
diff --git a/src/main/java/io/castle/client/Castle.java b/src/main/java/io/castle/client/Castle.java
@@ -271,7 +271,7 @@ public CastleResponse get(String path) {
      * @param payload request payload
      * @return a decoded json response
      */
-    public CastleResponse post(String path, ImmutableMap<String, Object> payload) {
+    public CastleResponse post(String path, ImmutableMap<Object, Object> payload) {
         return client().post(path, payload);
     }
     /**
@@ -291,7 +291,7 @@ public CastleResponse put(String path) {
      * @param payload request payload
      * @return a decoded json response
      */
-    public CastleResponse put(String path, ImmutableMap<String, Object> payload) {
+    public CastleResponse put(String path, ImmutableMap<Object, Object> payload) {
         return client().put(path, payload);
     }
 
@@ -312,7 +312,7 @@ public CastleResponse delete(String path) {
      * @param payload request payload
      * @return a decoded json response
      */
-    public CastleResponse delete(String path, ImmutableMap<String, Object> payload) {
+    public CastleResponse delete(String path, ImmutableMap<Object, Object> payload) {
         return client().delete(path, payload);
     }
 }
diff --git a/src/main/java/io/castle/client/api/CastleApi.java b/src/main/java/io/castle/client/api/CastleApi.java
@@ -289,37 +289,37 @@ public interface CastleApi {
 
     CastleResponse get(String path);
 
-    CastleResponse post(String path, ImmutableMap<String, Object> payload);
+    CastleResponse post(String path, ImmutableMap<Object, Object> payload);
 
     CastleResponse put(String path);
 
-    CastleResponse put(String path, ImmutableMap<String, Object> payload);
+    CastleResponse put(String path, ImmutableMap<Object, Object> payload);
 
     CastleResponse delete(String path);
 
-    CastleResponse delete(String path, ImmutableMap<String, Object> payload);
+    CastleResponse delete(String path, ImmutableMap<Object, Object> payload);
 
     /**
      * Makes a sync POST request to the risk endpoint.
      *
      * @param payload Event parameters
      * @return
      */
-    CastleResponse risk(ImmutableMap<String, Object> payload);
+    CastleResponse risk(ImmutableMap<Object, Object> payload);
 
     /**
      * Makes a sync POST request to the filter endpoint.
      *
      * @param payload Event parameters
      * @return
      */
-    CastleResponse filter(ImmutableMap<String, Object> payload);
+    CastleResponse filter(ImmutableMap<Object, Object> payload);
 
     /**
      * Makes a sync POST request to the log endpoint.
      *
      * @param payload Event parameters
      * @return
      */
-    CastleResponse log(ImmutableMap<String, Object> payload);
+    CastleResponse log(ImmutableMap<Object, Object> payload);
 }
diff --git a/src/main/java/io/castle/client/internal/CastleApiImpl.java b/src/main/java/io/castle/client/internal/CastleApiImpl.java
@@ -285,7 +285,7 @@ public CastleResponse get(String path) {
     }
 
     @Override
-    public CastleResponse post(String path, ImmutableMap<String, Object> payload) {
+    public CastleResponse post(String path, ImmutableMap<Object, Object> payload) {
         RestApi restApi = configuration.getRestApiFactory().buildBackend();
         return restApi.post(path, payload);
     }
@@ -297,7 +297,7 @@ public CastleResponse put(String path) {
     }
 
     @Override
-    public CastleResponse put(String path, ImmutableMap<String, Object> payload) {
+    public CastleResponse put(String path, ImmutableMap<Object, Object> payload) {
         RestApi restApi = configuration.getRestApiFactory().buildBackend();
         return restApi.put(path, payload);
     }
@@ -309,26 +309,26 @@ public CastleResponse delete(String path) {
     }
 
     @Override
-    public CastleResponse delete(String path, ImmutableMap<String, Object> payload) {
+    public CastleResponse delete(String path, ImmutableMap<Object, Object> payload) {
         RestApi restApi = configuration.getRestApiFactory().buildBackend();
         return restApi.delete(path, payload);
     }
 
-    public CastleResponse risk(ImmutableMap<String, Object> payload) {
+    public CastleResponse risk(ImmutableMap<Object, Object> payload) {
         Preconditions.checkNotNull(payload);
         RestApi restApi = configuration.getRestApiFactory().buildBackend();
         return restApi.post(Castle.URL_RISK, payload);
     }
 
     @Override
-    public CastleResponse filter(ImmutableMap<String, Object> payload) {
+    public CastleResponse filter(ImmutableMap<Object, Object> payload) {
         Preconditions.checkNotNull(payload);
         RestApi restApi = configuration.getRestApiFactory().buildBackend();
         return restApi.post(Castle.URL_FILTER, payload);
     }
 
     @Override
-    public CastleResponse log(ImmutableMap<String, Object> payload) {
+    public CastleResponse log(ImmutableMap<Object, Object> payload) {
         Preconditions.checkNotNull(payload);
         RestApi restApi = configuration.getRestApiFactory().buildBackend();
         return restApi.post(Castle.URL_LOG, payload);

diff --git a/src/main/java/io/castle/client/internal/backend/OkRestApiBackend.java b/src/main/java/io/castle/client/internal/backend/OkRestApiBackend.java
@@ -255,7 +255,7 @@ public CastleResponse put(String path) {
     }
 
     @Override
-    public CastleResponse put(String path, ImmutableMap<String, Object> payload) {
+    public CastleResponse put(String path, ImmutableMap<Object, Object> payload) {
         return makeRequest(path, model.getGson().toJsonTree(payload), METHOD_PUT);
     }
 
@@ -265,12 +265,12 @@ public CastleResponse delete(String path) {
     }
 
     @Override
-    public CastleResponse delete(String path, ImmutableMap<String, Object> payload) {
+    public CastleResponse delete(String path, ImmutableMap<Object, Object> payload) {
         return makeRequest(path, model.getGson().toJsonTree(payload), METHOD_DELETE);
     }
 
     @Override
-    public CastleResponse post(String path, ImmutableMap<String, Object> payload) {
+    public CastleResponse post(String path, ImmutableMap<Object, Object> payload) {
         return makeRequest(path, model.getGson().toJsonTree(payload), METHOD_POST);
     }
 

diff --git a/src/main/java/io/castle/client/internal/backend/RestApi.java b/src/main/java/io/castle/client/internal/backend/RestApi.java
@@ -103,7 +103,7 @@ public interface RestApi {
      * @param payload request payload
      * @return a decoded json response
      */
-    CastleResponse post(String path, ImmutableMap<String, Object> payload);
+    CastleResponse post(String path, ImmutableMap<Object, Object> payload);
 
     /**
      * Make a PUT request to a Castle API endpoint such as /v1/devices/{deviceToken}/report
@@ -120,7 +120,7 @@ public interface RestApi {
      * @param payload request payload
      * @return a decoded json response
      */
-    CastleResponse put(String path, ImmutableMap<String, Object> payload);
+    CastleResponse put(String path, ImmutableMap<Object, Object> payload);
 
     /**
      * Make a DELETE request to a Castle API endpoint such as /v1/impersonate
@@ -137,5 +137,5 @@ public interface RestApi {
      * @param payload request payload
      * @return a decoded json response
      */
-    CastleResponse delete(String path, ImmutableMap<String, Object> payload);
+    CastleResponse delete(String path, ImmutableMap<Object, Object> payload);
 }
diff --git a/src/test/java/io/castle/client/CastleGenericAPIHttpTest.java b/src/test/java/io/castle/client/CastleGenericAPIHttpTest.java
@@ -55,7 +55,7 @@ public void postRequest() throws InterruptedException, JSONException {
                 .build();
 
         // and an authenticate request is made
-        CastleResponse response = sdk.onRequest(request).post("/v1/authenticate", new ImmutableMap.Builder<String, Object>()
+        CastleResponse response = sdk.onRequest(request).post("/v1/authenticate", ImmutableMap.builder()
                 .put("event", "$login.succeeded")
                 .put("userId", "12345")
                 .put("context", payload)
@@ -85,7 +85,7 @@ public void putRequest() throws InterruptedException, JSONException {
         HttpServletRequest request = new MockHttpServletRequest();
 
         // Request is made
-        CastleResponse response = sdk.onRequest(request).put("/v1/test", new ImmutableMap.Builder<String, Object>()
+        CastleResponse response = sdk.onRequest(request).put("/v1/test", ImmutableMap.builder()
                 .put("event", "test")
                 .put("userId", "12345")
                 .build());
@@ -135,7 +135,7 @@ public void deleteRequest() throws InterruptedException, JSONException {
         HttpServletRequest request = new MockHttpServletRequest();
 
         // Request is made
-        CastleResponse response = sdk.onRequest(request).delete("/v1/test", new ImmutableMap.Builder<String, Object>()
+        CastleResponse response = sdk.onRequest(request).delete("/v1/test", ImmutableMap.builder()
                 .put("event", "test")
                 .put("userId", "12345")
                 .build());