Store all Data struct in the same directory

src/main/java/com/meilisearch/sdk/Client.java

@@ -7,6 +7,8 @@
 import com.auth0.jwt.algorithms.Algorithm;
 import com.google.gson.Gson;
 import com.meilisearch.sdk.exceptions.MeiliSearchException;
+import com.meilisearch.sdk.model.Key;
+import com.meilisearch.sdk.model.Task;
 import java.util.Date;
 import java.util.Map;
 import java.util.TimeZone;

src/main/java/com/meilisearch/sdk/Documents.java

@@ -4,6 +4,7 @@
 
 import com.google.gson.Gson;
 import com.google.gson.JsonArray;
+import com.meilisearch.sdk.model.Task;
 import java.util.List;
 
 /** Wrapper around MeiliSearchHttpRequest class to use for Meilisearch documents */

src/main/java/com/meilisearch/sdk/Index.java

@@ -2,6 +2,9 @@
 
 import com.google.gson.Gson;
 import com.meilisearch.sdk.model.SearchResult;
+import com.meilisearch.sdk.model.Settings;
+import com.meilisearch.sdk.model.Task;
+import com.meilisearch.sdk.model.TypoTolerance;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;

src/main/java/com/meilisearch/sdk/KeysHandler.java

@@ -3,6 +3,8 @@
 import com.google.gson.*;
 import com.google.gson.reflect.TypeToken;
 import com.meilisearch.sdk.exceptions.MeiliSearchApiException;
+import com.meilisearch.sdk.model.Key;
+import com.meilisearch.sdk.model.Result;
 
 /**
  * Wrapper around MeilisearchHttpRequest class to use for MeiliSearch keys

src/main/java/com/meilisearch/sdk/SettingsHandler.java

@@ -1,6 +1,9 @@
 package com.meilisearch.sdk;
 
 import com.google.gson.Gson;
+import com.meilisearch.sdk.model.Settings;
+import com.meilisearch.sdk.model.Task;
+import com.meilisearch.sdk.model.TypoTolerance;
 import java.util.Map;
 
 /**

src/main/java/com/meilisearch/sdk/TasksHandler.java

@@ -3,6 +3,8 @@
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import com.meilisearch.sdk.exceptions.MeiliSearchApiException;
+import com.meilisearch.sdk.model.Result;
+import com.meilisearch.sdk.model.Task;
 import java.util.Date;
 
 /**

src/main/java/com/meilisearch/sdk/Details.java → src/main/java/com/meilisearch/sdk/model/Details.java

@@ -1,4 +1,4 @@
-package com.meilisearch.sdk;
+package com.meilisearch.sdk.model;
 
 import java.util.Map;
 import lombok.Getter;
@@ -7,9 +7,6 @@
 @Getter
 @Setter
 public class Details {
-
-    public Details() {}
-
     protected int receivedDocuments;
     protected int indexedDocuments;
     protected int deletedDocuments;
@@ -23,4 +20,6 @@ public Details() {}
     protected Map<String, String[]> synonyms;
     protected String distinctAttribute;
     protected TypoTolerance typoTolerance;
+
+    public Details() {}
 }

src/main/java/com/meilisearch/sdk/model/IndexStats.java

@@ -0,0 +1,22 @@
+package com.meilisearch.sdk.model;
+
+import java.util.Map;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class IndexStats {
+    protected long numberOfDocuments;
+    protected boolean isIndexing;
+    protected Map<String, Integer> fieldDistribution;
+
+    public IndexStats() {}
+
+    public IndexStats(
+            long numberOfDocuments, boolean isIndexing, Map<String, Integer> fieldDistribution) {
+        this.numberOfDocuments = numberOfDocuments;
+        this.isIndexing = isIndexing;
+        this.fieldDistribution = fieldDistribution;
+    }
+}

src/main/java/com/meilisearch/sdk/Key.java → src/main/java/com/meilisearch/sdk/model/Key.java

@@ -1,12 +1,16 @@
-package com.meilisearch.sdk;
+package com.meilisearch.sdk.model;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import java.util.Date;
 import lombok.Getter;
 import lombok.Setter;
 
-/** MeiliSearch response for a Key */
+/**
+ * Data structure of MeiliSearch response for a Key
+ *
+ * <p>Refer https://docs.meilisearch.com/reference/api/keys.html
+ */
 @Getter
 public class Key {
     @Setter protected String description = null;
@@ -17,7 +21,6 @@ public class Key {
     protected Date createdAt = null;
     protected Date updatedAt = null;
 
-    /** Calls instance for MeiliSearch Key */
     public Key() {}
 
     /**

src/main/java/com/meilisearch/sdk/Result.java → src/main/java/com/meilisearch/sdk/model/Result.java

@@ -1,9 +1,9 @@
-package com.meilisearch.sdk;
+package com.meilisearch.sdk.model;
 
 import com.google.gson.Gson;
 import lombok.Getter;
 
-/** MeiliSearch response for a Result */
+/** Data structure of MeiliSearch response for a Result */
 public class Result<T> {
     @Getter protected T[] results = null;
 

src/main/java/com/meilisearch/sdk/Settings.java → src/main/java/com/meilisearch/sdk/model/Settings.java

@@ -1,5 +1,6 @@
-package com.meilisearch.sdk;
+package com.meilisearch.sdk.model;
 
+import com.meilisearch.sdk.Index;
 import java.util.HashMap;
 import lombok.Getter;
 import lombok.Setter;
@@ -13,25 +14,24 @@
 @Getter
 @Setter
 public class Settings {
-    private HashMap<String, String[]> synonyms;
-    private String[] stopWords;
-    private String[] rankingRules;
-    private String[] filterableAttributes;
-    private String distinctAttribute;
-    private String[] searchableAttributes;
-    private String[] displayedAttributes;
-    private String[] sortableAttributes;
-    private TypoTolerance typoTolerance;
+    protected HashMap<String, String[]> synonyms;
+    protected String[] stopWords;
+    protected String[] rankingRules;
+    protected String[] filterableAttributes;
+    protected String distinctAttribute;
+    protected String[] searchableAttributes;
+    protected String[] displayedAttributes;
+    protected String[] sortableAttributes;
+    protected TypoTolerance typoTolerance;
 
-    /** Empty SettingsRequest constructor */
     public Settings() {}
 
     /**
      * Method that returns the JSON String of the update settings query
      *
      * @return JSON String of the update settings query
      */
-    String getUpdateQuery() {
+    public String getUpdateQuery() {
         JSONObject jsonObject = new JSONObject();
         if (this.getSynonyms() != null) {
             jsonObject.put("synonyms", this.getSynonyms());

src/main/java/com/meilisearch/sdk/model/Stats.java

@@ -0,0 +1,25 @@
+package com.meilisearch.sdk.model;
+
+import java.util.Date;
+import java.util.Map;
+import lombok.Getter;
+
+/**
+ * Data structure for the stats
+ *
+ * <p>Refer https://docs.meilisearch.com/reference/api/stats.html
+ */
+@Getter
+public class Stats {
+    protected long databaseSize;
+    protected Date lastUpdate;
+    protected Map<String, IndexStats> indexes;
+
+    public Stats() {}
+
+    public Stats(long databaseSize, Date lastUpdate, Map<String, IndexStats> indexes) {
+        this.databaseSize = databaseSize;
+        this.lastUpdate = lastUpdate;
+        this.indexes = indexes;
+    }
+}

src/main/java/com/meilisearch/sdk/Task.java → src/main/java/com/meilisearch/sdk/model/Task.java

@@ -1,10 +1,15 @@
-package com.meilisearch.sdk;
+package com.meilisearch.sdk.model;
 
 import com.google.gson.Gson;
+import com.meilisearch.sdk.TaskError;
 import java.util.Date;
 import lombok.Getter;
 
-/** MeiliSearch response for a Task */
+/**
+ * Data structure of MeiliSearch response for a Task
+ *
+ * <p>Refer https://docs.meilisearch.com/reference/api/tasks.html
+ */
 @Getter
 public class Task {
     protected String status = "";
@@ -20,6 +25,8 @@ public class Task {
 
     private static Gson gsonTask = new Gson();
 
+    public Task() {}
+
     /**
      * Method to return the JSON String of the Task
      *

src/main/java/com/meilisearch/sdk/TypoTolerance.java → src/main/java/com/meilisearch/sdk/model/TypoTolerance.java

@@ -1,15 +1,22 @@
-package com.meilisearch.sdk;
+package com.meilisearch.sdk.model;
 
 import java.util.HashMap;
 import lombok.Getter;
 import lombok.Setter;
 import org.json.JSONObject;
 
+/**
+ * Data structure for the Typo tolerance setting
+ *
+ * <p>Refer https://docs.meilisearch.com/reference/api/typo_tolerance.html
+ */
+@Getter
+@Setter
 public class TypoTolerance {
-    @Getter @Setter private boolean enabled = true;
-    @Getter @Setter private HashMap<String, Integer> minWordSizeForTypos;
-    @Getter @Setter private String[] disableOnWords;
-    @Getter @Setter private String[] disableOnAttributes;
+    protected boolean enabled = true;
+    protected HashMap<String, Integer> minWordSizeForTypos;
+    protected String[] disableOnWords;
+    protected String[] disableOnAttributes;
 
     /**
      * Method to return the JSONObject of the TypoTolerance Setting

src/test/java/com/meilisearch/integration/ClientTest.java

@@ -8,8 +8,8 @@
 import com.meilisearch.integration.classes.AbstractIT;
 import com.meilisearch.integration.classes.TestData;
 import com.meilisearch.sdk.Index;
-import com.meilisearch.sdk.Task;
 import com.meilisearch.sdk.exceptions.MeiliSearchApiException;
+import com.meilisearch.sdk.model.Task;
 import com.meilisearch.sdk.utils.Movie;
 import java.util.Arrays;
 import org.junit.jupiter.api.AfterAll;

src/test/java/com/meilisearch/integration/DocumentsTest.java

@@ -7,8 +7,8 @@
 import com.meilisearch.integration.classes.AbstractIT;
 import com.meilisearch.integration.classes.TestData;
 import com.meilisearch.sdk.Index;
-import com.meilisearch.sdk.Task;
 import com.meilisearch.sdk.exceptions.MeiliSearchApiException;
+import com.meilisearch.sdk.model.Task;
 import com.meilisearch.sdk.utils.Movie;
 import java.util.ArrayList;
 import java.util.Arrays;

src/test/java/com/meilisearch/integration/KeysTest.java

@@ -3,7 +3,7 @@
 import static org.junit.jupiter.api.Assertions.*;
 
 import com.meilisearch.integration.classes.AbstractIT;
-import com.meilisearch.sdk.Key;
+import com.meilisearch.sdk.model.Key;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import org.junit.jupiter.api.AfterAll;

src/test/java/com/meilisearch/integration/SearchNestedTest.java

@@ -6,9 +6,9 @@
 import com.meilisearch.integration.classes.TestData;
 import com.meilisearch.sdk.Index;
 import com.meilisearch.sdk.SearchRequest;
-import com.meilisearch.sdk.Settings;
-import com.meilisearch.sdk.Task;
 import com.meilisearch.sdk.json.GsonJsonHandler;
+import com.meilisearch.sdk.model.Settings;
+import com.meilisearch.sdk.model.Task;
 import com.meilisearch.sdk.utils.Movie;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Tag;

src/test/java/com/meilisearch/integration/SearchTest.java

@@ -8,10 +8,10 @@
 import com.meilisearch.integration.classes.TestData;
 import com.meilisearch.sdk.Index;
 import com.meilisearch.sdk.SearchRequest;
-import com.meilisearch.sdk.Settings;
-import com.meilisearch.sdk.Task;
 import com.meilisearch.sdk.json.GsonJsonHandler;
 import com.meilisearch.sdk.model.SearchResult;
+import com.meilisearch.sdk.model.Settings;
+import com.meilisearch.sdk.model.Task;
 import com.meilisearch.sdk.utils.Movie;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeEach;

src/test/java/com/meilisearch/integration/SettingsTest.java

@@ -11,10 +11,10 @@
 import com.meilisearch.integration.classes.AbstractIT;
 import com.meilisearch.integration.classes.TestData;
 import com.meilisearch.sdk.Index;
-import com.meilisearch.sdk.Settings;
-import com.meilisearch.sdk.Task;
-import com.meilisearch.sdk.TypoTolerance;
 import com.meilisearch.sdk.json.GsonJsonHandler;
+import com.meilisearch.sdk.model.Settings;
+import com.meilisearch.sdk.model.Task;
+import com.meilisearch.sdk.model.TypoTolerance;
 import com.meilisearch.sdk.utils.Movie;
 import java.util.Arrays;
 import java.util.HashMap;

src/test/java/com/meilisearch/integration/TasksTest.java

@@ -5,7 +5,7 @@
 import com.meilisearch.integration.classes.AbstractIT;
 import com.meilisearch.integration.classes.TestData;
 import com.meilisearch.sdk.Index;
-import com.meilisearch.sdk.Task;
+import com.meilisearch.sdk.model.Task;
 import com.meilisearch.sdk.utils.Movie;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeEach;

src/test/java/com/meilisearch/integration/TenantTokenTest.java

@@ -7,12 +7,12 @@
 import com.meilisearch.sdk.Client;
 import com.meilisearch.sdk.Config;
 import com.meilisearch.sdk.Index;
-import com.meilisearch.sdk.Key;
-import com.meilisearch.sdk.Settings;
-import com.meilisearch.sdk.Task;
 import com.meilisearch.sdk.TenantTokenOptions;
 import com.meilisearch.sdk.exceptions.MeiliSearchException;
+import com.meilisearch.sdk.model.Key;
 import com.meilisearch.sdk.model.SearchResult;
+import com.meilisearch.sdk.model.Settings;
+import com.meilisearch.sdk.model.Task;
 import com.meilisearch.sdk.utils.Movie;
 import java.util.Date;
 import java.util.HashMap;

src/test/java/com/meilisearch/integration/classes/AbstractIT.java

@@ -5,8 +5,8 @@
 import com.meilisearch.sdk.Client;
 import com.meilisearch.sdk.Config;
 import com.meilisearch.sdk.Index;
-import com.meilisearch.sdk.Key;
-import com.meilisearch.sdk.Task;
+import com.meilisearch.sdk.model.Key;
+import com.meilisearch.sdk.model.Task;
 import com.meilisearch.sdk.utils.Movie;
 import java.io.*;
 import java.net.URL;