Apply indexes changes

alallema · alallema · commit dfda63056bd7 · 2022-12-27T19:37:58.000+01:00
diff --git a/src/main/java/com/meilisearch/sdk/Client.java b/src/main/java/com/meilisearch/sdk/Client.java
@@ -7,6 +7,7 @@
 import com.auth0.jwt.algorithms.Algorithm;
 import com.meilisearch.sdk.exceptions.MeilisearchException;
 import com.meilisearch.sdk.json.JsonHandler;
+import com.meilisearch.sdk.model.IndexesQuery;
 import com.meilisearch.sdk.model.Key;
 import com.meilisearch.sdk.model.Results;
 import com.meilisearch.sdk.model.Stats;
@@ -73,9 +74,25 @@ public TaskInfo createIndex(String uid, String primaryKey) throws MeilisearchExc
      * @return Array of indexes in the Meilisearch client
      * @throws MeilisearchException if an error occurs
      */
-    public Index[] getIndexes() throws MeilisearchException {
-        Index[] indexes = jsonHandler.decode(getRawIndexes(), Index[].class);
-        for (Index index : indexes) {
+    public Results<Index> getIndexes() throws MeilisearchException {
+        Results<Index> indexes = this.indexesHandler.getAll();
+        for (Index index : indexes.getResults()) {
+            index.setConfig(this.config);
+        }
+        return indexes;
+    }
+
+    /**
+     * Gets indexes in the current Meilisearch instance
+     * https://docs.meilisearch.com/reference/api/indexes.html#list-all-indexes
+     *
+     * @param param accept by the indexes route
+     * @return Array of indexes in the Meilisearch client
+     * @throws MeilisearchException if an error occurs
+     */
+    public Results<Index> getIndexes(IndexesQuery param) throws MeilisearchException {
+        Results<Index> indexes = this.indexesHandler.getAll(param);
+        for (Index index : indexes.getResults()) {
             index.setConfig(this.config);
         }
         return indexes;
@@ -89,7 +106,7 @@ public Index[] getIndexes() throws MeilisearchException {
      * @throws MeilisearchException if an error occurs
      */
     public String getRawIndexes() throws MeilisearchException {
-        return this.indexesHandler.getAll();
+        return this.indexesHandler.getAllRaw();
     }
 
     /**
@@ -117,23 +134,11 @@ public Index index(String uid) throws MeilisearchException {
      * @throws MeilisearchException if an error occurs
      */
     public Index getIndex(String uid) throws MeilisearchException {
-        Index index = jsonHandler.decode(getRawIndex(uid), Index.class);
+        Index index = this.indexesHandler.get(uid);
         index.setConfig(this.config);
         return index;
     }
 
-    /**
-     * Gets single index by its unique identifier
-     * https://docs.meilisearch.com/reference/api/indexes.html#get-one-index
-     *
-     * @param uid Unique identifier of the index to get
-     * @return Meilisearch API response as String
-     * @throws MeilisearchException if an error occurs
-     */
-    public String getRawIndex(String uid) throws MeilisearchException {
-        return this.indexesHandler.get(uid);
-    }
-
     /**
      * Updates the primary key of an index in the Meilisearch instance
      * https://docs.meilisearch.com/reference/api/indexes.html#update-an-index
diff --git a/src/main/java/com/meilisearch/sdk/IndexesHandler.java b/src/main/java/com/meilisearch/sdk/IndexesHandler.java
@@ -1,6 +1,9 @@
 package com.meilisearch.sdk;
 
 import com.meilisearch.sdk.exceptions.MeilisearchException;
+import com.meilisearch.sdk.http.URLBuilder;
+import com.meilisearch.sdk.model.IndexesQuery;
+import com.meilisearch.sdk.model.Results;
 import com.meilisearch.sdk.model.TaskInfo;
 import java.util.HashMap;
 
@@ -56,9 +59,11 @@ TaskInfo create(String uid, String primaryKey) throws MeilisearchException {
      * @return Meilisearch API response
      * @throws MeilisearchException if an error occurs
      */
-    String get(String uid) throws MeilisearchException {
-        String requestQuery = "/indexes/" + uid;
-        return httpClient.get(requestQuery, String.class);
+    Index get(String uid) throws MeilisearchException {
+        URLBuilder urlb = new URLBuilder();
+        urlb.addSubroute("indexes").addSubroute(uid);
+        String urlPath = urlb.getURL();
+        return httpClient.get(urlPath, Index.class);
     }
 
     /**
@@ -67,7 +72,33 @@ String get(String uid) throws MeilisearchException {
      * @return Meilisearch API response
      * @throws MeilisearchException if an error occurs
      */
-    String getAll() throws MeilisearchException {
+    Results<Index> getAll() throws MeilisearchException {
+        return httpClient.get("/indexes", Results.class, Index.class);
+    }
+
+    /**
+     * Gets indexes in the current Meilisearch instance
+     *
+     * @param param accept by the indexes route
+     * @return Meilisearch API response
+     * @throws MeilisearchException if an error occurs
+     */
+    Results<Index> getAll(IndexesQuery param) throws MeilisearchException {
+        URLBuilder urlb = new URLBuilder();
+        urlb.addSubroute("indexes")
+                .addParameter("limit", param.getLimit())
+                .addParameter("offset", param.getOffset());
+        String urlQuery = urlb.getURL();
+        return httpClient.get(urlQuery, Results.class, Index.class);
+    }
+
+    /**
+     * Gets all indexes in the current Meilisearch instance
+     *
+     * @return Meilisearch API response
+     * @throws MeilisearchException if an error occurs
+     */
+    String getAllRaw() throws MeilisearchException {
         return httpClient.get("/indexes", String.class);
     }
 
@@ -83,8 +114,10 @@ TaskInfo updatePrimaryKey(String uid, String primaryKey) throws MeilisearchExcep
         HashMap<String, String> index = new HashMap<String, String>();
         index.put("primaryKey", primaryKey);
 
-        String requestQuery = "/indexes/" + uid;
-        return httpClient.patch(requestQuery, index, TaskInfo.class);
+        URLBuilder urlb = new URLBuilder();
+        urlb.addSubroute("indexes").addSubroute(uid);
+        String urlPath = urlb.getURL();
+        return httpClient.patch(urlPath, index, TaskInfo.class);
     }
 
     /**
@@ -95,7 +128,9 @@ TaskInfo updatePrimaryKey(String uid, String primaryKey) throws MeilisearchExcep
      * @throws MeilisearchException if an error occurs
      */
     TaskInfo delete(String uid) throws MeilisearchException {
-        String requestQuery = "/indexes/" + uid;
-        return httpClient.delete(requestQuery, TaskInfo.class);
+        URLBuilder urlb = new URLBuilder();
+        urlb.addSubroute("indexes").addSubroute(uid);
+        String urlPath = urlb.getURL();
+        return httpClient.delete(urlPath, TaskInfo.class);
     }
 }
diff --git a/src/main/java/com/meilisearch/sdk/model/IndexesQuery.java b/src/main/java/com/meilisearch/sdk/model/IndexesQuery.java
@@ -0,0 +1,20 @@
+package com.meilisearch.sdk.model;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+/**
+ * Data structure of a query parameter for index route
+ *
+ * <p>https://docs.meilisearch.com/reference/api/indexes.html#query-parameters
+ */
+@Setter
+@Getter
+@Accessors(chain = true)
+public class IndexesQuery {
+    private int offset = -1;
+    private int limit = -1;
+
+    public IndexesQuery() {}
+}
diff --git a/src/test/java/com/meilisearch/integration/ClientTest.java b/src/test/java/com/meilisearch/integration/ClientTest.java
@@ -9,6 +9,7 @@
 import com.meilisearch.integration.classes.TestData;
 import com.meilisearch.sdk.Index;
 import com.meilisearch.sdk.exceptions.MeilisearchApiException;
+import com.meilisearch.sdk.model.Results;
 import com.meilisearch.sdk.model.TaskInfo;
 import com.meilisearch.sdk.utils.Movie;
 import java.util.Arrays;
@@ -139,29 +140,15 @@ public void testGetIndex() throws Exception {
         client.deleteIndex(index.getUid());
     }
 
-    /** Test getRawIndex */
-    @Test
-    public void testGetRawIndex() throws Exception {
-        String indexUid = "GetRawIndex";
-        Index index = createEmptyIndex(indexUid, this.primaryKey);
-        String getIndex = client.getRawIndex(indexUid);
-        JsonObject indexJson = JsonParser.parseString(getIndex).getAsJsonObject();
-
-        assertEquals(index.getUid(), indexJson.get("uid").getAsString());
-        assertEquals(index.getPrimaryKey(), indexJson.get("primaryKey").getAsString());
-
-        client.deleteIndex(index.getUid());
-    }
-
     /** Test getIndexes */
     @Test
     public void testGetIndexes() throws Exception {
         String[] indexUids = {"GetIndexes", "GetIndexes2"};
         createEmptyIndex(indexUids[0]);
         createEmptyIndex(indexUids[1], this.primaryKey);
-        Index[] indexes = client.getIndexes();
+        Results<Index> indexes = client.getIndexes();
 
-        assertEquals(2, indexes.length);
+        assertEquals(2, indexes.getResults().length);
         assert (Arrays.asList(indexUids).contains(indexUids[0]));
         assert (Arrays.asList(indexUids).contains(indexUids[1]));
 
@@ -177,7 +164,8 @@ public void testGetRawIndexes() throws Exception {
         createEmptyIndex(indexUids[1], this.primaryKey);
 
         String indexes = client.getRawIndexes();
-        JsonArray jsonIndexArray = JsonParser.parseString(indexes).getAsJsonArray();
+        JsonObject jsonIndexObject = JsonParser.parseString(indexes).getAsJsonObject();
+        JsonArray jsonIndexArray = jsonIndexObject.getAsJsonArray("results");
 
         assertEquals(4, jsonIndexArray.size());
         assert (Arrays.asList(indexUids)
