Modification of the get method with generic parameters

alallema · alallema · commit 82d32f93038e · 2022-10-24T12:05:29.000+02:00
diff --git a/src/main/java/com/meilisearch/sdk/Documents.java b/src/main/java/com/meilisearch/sdk/Documents.java
@@ -24,7 +24,7 @@ protected Documents(Config config) {
      */
     String getDocument(String uid, String identifier) throws MeilisearchException {
         String urlPath = "/indexes/" + uid + "/documents/" + identifier;
-        return httpClient.get(urlPath);
+        return httpClient.get(urlPath, String.class);
     }
 
     /**
@@ -36,7 +36,7 @@ String getDocument(String uid, String identifier) throws MeilisearchException {
      */
     String getDocuments(String uid) throws MeilisearchException {
         String urlPath = "/indexes/" + uid + "/documents";
-        return httpClient.get(urlPath);
+        return httpClient.get(urlPath, String.class);
     }
 
     /**
@@ -49,7 +49,7 @@ String getDocuments(String uid) throws MeilisearchException {
      */
     String getDocuments(String uid, int limit) throws MeilisearchException {
         String urlQuery = "/indexes/" + uid + "/documents?limit=" + limit;
-        return httpClient.get(urlQuery);
+        return httpClient.get(urlQuery, String.class);
     }
 
     /**
@@ -63,7 +63,7 @@ String getDocuments(String uid, int limit) throws MeilisearchException {
      */
     String getDocuments(String uid, int limit, int offset) throws MeilisearchException {
         String urlQuery = "/indexes/" + uid + "/documents?limit=" + limit + "&offset=" + offset;
-        return httpClient.get(urlQuery);
+        return httpClient.get(urlQuery, String.class);
     }
 
     /**
@@ -93,7 +93,7 @@ String getDocuments(String uid, int limit, int offset, List<String> attributesTo
                         + "&attributesToRetrieve="
                         + attributesToRetrieveCommaSeparated;
 
-        return httpClient.get(urlQuery);
+        return httpClient.get(urlQuery, String.class);
     }
 
     /**
diff --git a/src/main/java/com/meilisearch/sdk/HttpClient.java b/src/main/java/com/meilisearch/sdk/HttpClient.java
@@ -51,8 +51,9 @@ public HttpClient(CustomOkHttpClient client, BasicRequest request) {
      * @return document that was requested
      * @throws MeilisearchException if the response is an error
      */
-    public String get(String api) throws MeilisearchException {
-        return this.get(api, "");
+    <T> T get(String api, Class<T> targetClass, Class<?>... parameters)
+            throws MeilisearchException {
+        return this.get(api, "", targetClass, parameters);
     }
 
     /**
@@ -63,15 +64,20 @@ public String get(String api) throws MeilisearchException {
      * @return document that was requested
      * @throws MeilisearchException if the response is an error
      */
-    String get(String api, String param) throws MeilisearchException {
-        HttpResponse httpResponse =
-                this.client.get(
-                        request.create(HttpMethod.GET, api + param, Collections.emptyMap(), null));
+    <T> T get(String api, String param, Class<T> targetClass, Class<?>... parameters)
+            throws MeilisearchException {
+        HttpResponse<T> httpResponse =
+                response.create(
+                        this.client.get(
+                                request.create(
+                                        HttpMethod.GET, api + param, Collections.emptyMap(), null)),
+                        targetClass,
+                        parameters);
         if (httpResponse.getStatusCode() >= 400) {
             throw new MeilisearchApiException(
                     jsonHandler.decode(httpResponse.getContent(), APIError.class));
         }
-        return new String(httpResponse.getContentAsBytes());
+        return httpResponse.getContent();
     }
 
     /**
diff --git a/src/main/java/com/meilisearch/sdk/Index.java b/src/main/java/com/meilisearch/sdk/Index.java
@@ -652,7 +652,7 @@ public void waitForTask(int taskId, int timeoutInMs, int intervalInMs)
     public void fetchPrimaryKey() throws MeilisearchException {
         String requestQuery = "/indexes/" + this.uid;
         HttpClient httpClient = config.httpClient;
-        Index retrievedIndex = config.jsonHandler.decode(httpClient.get(requestQuery), Index.class);
+        Index retrievedIndex = httpClient.get(requestQuery, Index.class);
         this.primaryKey = retrievedIndex.getPrimaryKey();
     }
 }
diff --git a/src/main/java/com/meilisearch/sdk/IndexesHandler.java b/src/main/java/com/meilisearch/sdk/IndexesHandler.java
@@ -53,7 +53,7 @@ String create(String uid, String primaryKey) throws MeilisearchException {
      */
     String get(String uid) throws MeilisearchException {
         String requestQuery = "/indexes/" + uid;
-        return httpClient.get(requestQuery);
+        return httpClient.get(requestQuery, String.class);
     }
 
     /**
@@ -63,7 +63,7 @@ String get(String uid) throws MeilisearchException {
      * @throws MeilisearchException if an error occurs
      */
     String getAll() throws MeilisearchException {
-        return httpClient.get("/indexes");
+        return httpClient.get("/indexes", String.class);
     }
 
     /**
diff --git a/src/main/java/com/meilisearch/sdk/KeysHandler.java b/src/main/java/com/meilisearch/sdk/KeysHandler.java
@@ -30,7 +30,7 @@ public KeysHandler(Config config) {
      */
     public Key getKey(String uid) throws MeilisearchException {
         String urlPath = "/keys/" + uid;
-        return httpClient.jsonHandler.decode(this.httpClient.get(urlPath), Key.class);
+        return httpClient.get(urlPath, Key.class);
     }
 
     /**
@@ -41,9 +41,7 @@ public Key getKey(String uid) throws MeilisearchException {
      */
     public Result<Key> getKeys() throws MeilisearchException {
         String urlPath = "/keys";
-        Result<Key> result =
-                httpClient.jsonHandler.decode(
-                        this.httpClient.get(urlPath), Result.class, Key.class);
+        Result<Key> result = httpClient.get(urlPath, Result.class, Key.class);
         return result;
     }
 
diff --git a/src/main/java/com/meilisearch/sdk/SettingsHandler.java b/src/main/java/com/meilisearch/sdk/SettingsHandler.java
@@ -32,8 +32,8 @@ public SettingsHandler(Config config) {
      * @throws MeilisearchException if an error occurs
      */
     public Settings getSettings(String uid) throws MeilisearchException {
-        return httpClient.jsonHandler.decode(
-                httpClient.get("/indexes/" + uid + "/settings"), Settings.class);
+        String urlPath = "/indexes/" + uid + "/settings";
+        return httpClient.get(urlPath, Settings.class);
     }
 
     /**
@@ -72,8 +72,8 @@ public Task resetSettings(String uid) throws MeilisearchException {
      * @throws MeilisearchException if an error occurs
      */
     public String[] getRankingRuleSettings(String uid) throws MeilisearchException {
-        return httpClient.jsonHandler.decode(
-                httpClient.get("/indexes/" + uid + "/settings/ranking-rules"), String[].class);
+        String urlPath = "/indexes/" + uid + "/settings/ranking-rules";
+        return httpClient.get(urlPath, String[].class);
     }
 
     /**
@@ -118,8 +118,8 @@ public Task resetRankingRulesSettings(String uid) throws MeilisearchException {
      * @throws MeilisearchException if an error occurs
      */
     public Map<String, String[]> getSynonymsSettings(String uid) throws MeilisearchException {
-        return httpClient.jsonHandler.decode(
-                httpClient.get("/indexes/" + uid + "/settings/synonyms"), Map.class);
+        String urlPath = "/indexes/" + uid + "/settings/synonyms";
+        return httpClient.jsonHandler.decode(httpClient.get(urlPath, String.class), Map.class);
     }
 
     /**
@@ -162,8 +162,8 @@ public Task resetSynonymsSettings(String uid) throws MeilisearchException {
      * @throws MeilisearchException if an error occurs
      */
     public String[] getStopWordsSettings(String uid) throws MeilisearchException {
-        return httpClient.jsonHandler.decode(
-                httpClient.get("/indexes/" + uid + "/settings/stop-words"), String[].class);
+        String urlPath = "/indexes/" + uid + "/settings/stop-words";
+        return httpClient.get(urlPath, String[].class);
     }
 
     /**
@@ -206,9 +206,8 @@ public Task resetStopWordsSettings(String uid) throws MeilisearchException {
      * @throws MeilisearchException if an error occurs
      */
     public String[] getSearchableAttributesSettings(String uid) throws MeilisearchException {
-        return httpClient.jsonHandler.decode(
-                httpClient.get("/indexes/" + uid + "/settings/searchable-attributes"),
-                String[].class);
+        String urlPath = "/indexes/" + uid + "/settings/searchable-attributes";
+        return httpClient.get(urlPath, String[].class);
     }
 
     /**
@@ -255,9 +254,8 @@ public Task resetSearchableAttributesSettings(String uid) throws MeilisearchExce
      * @throws MeilisearchException if an error occurs
      */
     public String[] getDisplayedAttributesSettings(String uid) throws MeilisearchException {
-        return httpClient.jsonHandler.decode(
-                httpClient.get("/indexes/" + uid + "/settings/displayed-attributes"),
-                String[].class);
+        String urlPath = "/indexes/" + uid + "/settings/displayed-attributes";
+        return httpClient.get(urlPath, String[].class);
     }
 
     /**
@@ -304,9 +302,8 @@ public Task resetDisplayedAttributesSettings(String uid) throws MeilisearchExcep
      * @throws MeilisearchException if an error occurs
      */
     public String[] getFilterableAttributesSettings(String uid) throws MeilisearchException {
-        return httpClient.jsonHandler.decode(
-                httpClient.get("/indexes/" + uid + "/settings/filterable-attributes"),
-                String[].class);
+        String urlPath = "/indexes/" + uid + "/settings/filterable-attributes";
+        return httpClient.get(urlPath, String[].class);
     }
 
     /**
@@ -353,10 +350,8 @@ public Task resetFilterableAttributesSettings(String uid) throws MeilisearchExce
      * @throws MeilisearchException if an error occurs
      */
     public String getDistinctAttributeSettings(String uid) throws MeilisearchException {
-        String response =
-                httpClient.jsonHandler.decode(
-                        httpClient.get("/indexes/" + uid + "/settings/distinct-attribute"),
-                        String.class);
+        String urlPath = "/indexes/" + uid + "/settings/distinct-attribute";
+        String response = httpClient.get(urlPath, String.class);
         return response.equals("null") ? null : response.substring(1, response.length() - 1);
     }
 
@@ -402,9 +397,8 @@ public Task resetDistinctAttributeSettings(String uid) throws MeilisearchExcepti
      * @throws MeilisearchException if an error occurs
      */
     public TypoTolerance getTypoToleranceSettings(String uid) throws MeilisearchException {
-        return httpClient.jsonHandler.decode(
-                httpClient.get("/indexes/" + uid + "/settings/typo-tolerance"),
-                TypoTolerance.class);
+        String urlPath = "/indexes/" + uid + "/settings/typo-tolerance";
+        return httpClient.get(urlPath, TypoTolerance.class);
     }
 
     /**
diff --git a/src/main/java/com/meilisearch/sdk/TasksHandler.java b/src/main/java/com/meilisearch/sdk/TasksHandler.java
@@ -35,7 +35,7 @@ public TasksHandler(Config config) {
      */
     public Task getTask(String indexUid, int taskUid) throws MeilisearchException {
         String urlPath = "/indexes/" + indexUid + "/tasks/" + taskUid;
-        return httpClient.jsonHandler.decode(this.httpClient.get(urlPath), Task.class);
+        return httpClient.get(urlPath, Task.class);
     }
 
     /**
@@ -48,9 +48,7 @@ public Task getTask(String indexUid, int taskUid) throws MeilisearchException {
     public Result<Task> getTasks(String indexUid) throws MeilisearchException {
         String urlPath = "/indexes/" + indexUid + "/tasks";
 
-        Result<Task> result =
-                httpClient.jsonHandler.decode(
-                        this.httpClient.get(urlPath), Result.class, Task.class);
+        Result<Task> result = httpClient.get(urlPath, Result.class, Task.class);
         return result;
     }
 
@@ -63,7 +61,7 @@ public Result<Task> getTasks(String indexUid) throws MeilisearchException {
      */
     public Task getTask(int taskUid) throws MeilisearchException {
         String urlPath = "/tasks/" + taskUid;
-        return httpClient.jsonHandler.decode(this.httpClient.get(urlPath), Task.class);
+        return httpClient.get(urlPath, Task.class);
     }
 
     /**
@@ -75,9 +73,7 @@ public Task getTask(int taskUid) throws MeilisearchException {
     public Result<Task> getTasks() throws MeilisearchException {
         String urlPath = "/tasks";
 
-        Result<Task> result =
-                httpClient.jsonHandler.decode(
-                        this.httpClient.get(urlPath), Result.class, Task.class);
+        Result<Task> result = httpClient.get(urlPath, Result.class, Task.class);
         return result;
     }
 
diff --git a/src/main/java/com/meilisearch/sdk/http/response/BasicResponse.java b/src/main/java/com/meilisearch/sdk/http/response/BasicResponse.java
@@ -9,14 +9,16 @@ public BasicResponse(JsonHandler jsonHandler) {
         this.jsonHandler = jsonHandler;
     }
 
-    public <T> HttpResponse create(HttpResponse response, Class<?> targetClass) {
+    public <T> HttpResponse<T> create(
+            HttpResponse<T> httpResponse, Class<T> targetClass, Class<?>... parameters) {
         try {
-            return new HttpResponse(
-                    response.getHeaders(),
-                    response.getStatusCode(),
-                    response.getContent() == null
+            return new HttpResponse<T>(
+                    httpResponse.getHeaders(),
+                    httpResponse.getStatusCode(),
+                    httpResponse.getContent() == null
                             ? null
-                            : this.jsonHandler.decode(response.getContent(), targetClass));
+                            : this.jsonHandler.decode(
+                                    httpResponse.getContent(), targetClass, parameters));
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
diff --git a/src/main/java/com/meilisearch/sdk/http/response/HttpResponse.java b/src/main/java/com/meilisearch/sdk/http/response/HttpResponse.java
@@ -4,12 +4,12 @@
 import lombok.Getter;
 
 @Getter
-public class HttpResponse {
+public class HttpResponse<T> {
     private final Map<String, String> headers;
     private final int statusCode;
-    private final String content;
+    private final T content;
 
-    public HttpResponse(Map<String, String> headers, int statusCode, String content) {
+    public HttpResponse(Map<String, String> headers, int statusCode, T content) {
         this.headers = headers;
         this.statusCode = statusCode;
         this.content = content;
@@ -20,6 +20,6 @@ public boolean hasContent() {
     }
 
     public byte[] getContentAsBytes() {
-        return content.getBytes();
+        return ((String) content).getBytes();
     }
 }
diff --git a/src/main/java/com/meilisearch/sdk/json/GsonJsonHandler.java b/src/main/java/com/meilisearch/sdk/json/GsonJsonHandler.java
@@ -49,7 +49,7 @@ public <T> T decode(Object o, Class<?> targetClass, Class<?>... parameters)
         }
         try {
             if (parameters == null || parameters.length == 0) {
-                return (T) gson.fromJson((String) o, targetClass);
+                return gson.<T>fromJson((String) o, targetClass);
             } else {
                 TypeToken<?> parameterized = TypeToken.getParameterized(targetClass, parameters);
                 return gson.fromJson((String) o, parameterized.getType());

Original file line number	Diff line number	Diff line change
`@@ -652,7 +652,7 @@ public void waitForTask(int taskId, int timeoutInMs, int intervalInMs)`
`652`	`652`	`public void fetchPrimaryKey() throws MeilisearchException {`
`653`	`653`	`String requestQuery = "/indexes/" + this.uid;`
`654`	`654`	`HttpClient httpClient = config.httpClient;`
`655`		`- Index retrievedIndex = config.jsonHandler.decode(httpClient.get(requestQuery), Index.class);`
	`655`	`+ Index retrievedIndex = httpClient.get(requestQuery, Index.class);`
`656`	`656`	`this.primaryKey = retrievedIndex.getPrimaryKey();`
`657`	`657`	`}`
`658`	`658`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public <T> T decode(Object o, Class<?> targetClass, Class<?>... parameters)`
`49`	`49`	`}`
`50`	`50`	`try {`
`51`	`51`	`if (parameters == null \|\| parameters.length == 0) {`
`52`		`- return (T) gson.fromJson((String) o, targetClass);`
	`52`	`+ return gson.<T>fromJson((String) o, targetClass);`
`53`	`53`	`} else {`
`54`	`54`	`TypeToken<?> parameterized = TypeToken.getParameterized(targetClass, parameters);`
`55`	`55`	`return gson.fromJson((String) o, parameterized.getType());`