Throw MeiliSearchApiException when status code > 400

Author: eskombro

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

@@ -5,6 +5,8 @@
 
 import com.google.gson.Gson;
 
+import com.meilisearch.sdk.exceptions.MeiliSearchApiException;
+
 /**
  * Meilisearch client
  */
@@ -32,10 +34,8 @@ public Client(Config config) {
 	 * @return Meilisearch API response
 	 * @throws Exception If an error occurs
 	 */
-	public Index createIndex(String uid) throws Exception {
-		Index index = gson.fromJson(this.indexesHandler.create(uid), Index.class);
-		index.setConfig(this.config);
-		return index;
+	public Index createIndex(String uid) throws Exception, MeiliSearchApiException {
+		return this.createIndex(uid, null);
 	}
 
 	/**
@@ -47,8 +47,7 @@ public Index createIndex(String uid) throws Exception {
 	 * @return Meilisearch API response
 	 * @throws Exception If an error occurs
 	 */
-	public Index createIndex(String uid, String primaryKey) throws Exception {
-		// return this.indexesHandler.create(uid, primaryKey);
+	public Index createIndex(String uid, String primaryKey) throws Exception, MeiliSearchApiException {
 		Index index = gson.fromJson(this.indexesHandler.create(uid, primaryKey), Index.class);
 		index.setConfig(this.config);
 		return index;

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

@@ -2,6 +2,8 @@
 
 import com.google.gson.JsonObject;
 
+import com.meilisearch.sdk.exceptions.MeiliSearchApiException;
+
 /**
  * Wrapper around the MeilisearchHttpRequest class to ease usage for Meilisearch indexes
  */
@@ -24,7 +26,7 @@ class IndexesHandler {
 	 * @return Meilisearch API response
 	 * @throws Exception If something goes wrong
 	 */
-	String create(String uid) throws Exception {
+	String create(String uid) throws Exception, MeiliSearchApiException {
 		return this.create(uid, null);
 	}
 
@@ -36,13 +38,12 @@ String create(String uid) throws Exception {
 	 * @return Meilisearch API response
 	 * @throws Exception If something goes wrong
 	 */
-	String create(String uid, String primaryKey) throws Exception {
+	String create(String uid, String primaryKey) throws Exception, MeiliSearchApiException {
 		JsonObject params = new JsonObject();
 		params.addProperty("uid", uid);
 		if (primaryKey != null) {
 			params.addProperty("primaryKey", primaryKey);
 		}
-
 		return meilisearchHttpRequest.post("/indexes", params.toString());
 	}
 

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

@@ -6,6 +6,7 @@
 import com.meilisearch.sdk.http.factory.RequestFactory;
 import com.meilisearch.sdk.http.request.HttpMethod;
 import com.meilisearch.sdk.http.response.HttpResponse;
+import com.meilisearch.sdk.exceptions.MeiliSearchApiException;
 
 import java.util.Collections;
 
@@ -34,14 +35,20 @@ String get(String api, String param) throws Exception {
 	}
 
 
-	String post(String api, String body) throws Exception {
+	String post(String api, String body) throws Exception, MeiliSearchApiException {
 		HttpResponse<?> httpResponse = this.client.post(factory.create(HttpMethod.POST, api, Collections.emptyMap(), body));
+		if (httpResponse.getStatusCode() >= 400) {
+			throw new MeiliSearchApiException(httpResponse.getContent().toString());
+		}
 		return new String(httpResponse.getContentAsBytes());
 	}
 
 
 	String put(String api, String body) throws Exception {
 		HttpResponse<?> httpResponse = this.client.put(factory.create(HttpMethod.PUT, api, Collections.emptyMap(), body));
+		if (httpResponse.getStatusCode() >= 400) {
+			throw new MeiliSearchApiException(httpResponse.getContent().toString());
+		}
 		return new String(httpResponse.getContentAsBytes());
 	}
 

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

@@ -11,6 +11,8 @@
 
 import static org.junit.jupiter.api.Assertions.*;
 
+import com.meilisearch.sdk.exceptions.MeiliSearchApiException;
+
 @Tag("integration")
 public class ClientTest extends AbstractIT {
 
@@ -53,6 +55,22 @@ public void testCreateIndexWithPrimaryKey() throws Exception {
 		client.deleteIndex(index.getUid());
 	}
 
+	/**
+	 * Test Index creation error: already exists
+	 */
+	@Test
+	public void testCreateIndexAlreadyExists() throws Exception {
+		String indexUid = "CreateIndexAlreadyExists";
+		Index index = client.createIndex(indexUid, this.primaryKey);
+		assertEquals(index.getUid(), indexUid);
+		assertEquals(index.getPrimaryKey(), this.primaryKey);
+		assertThrows(
+			MeiliSearchApiException.class,
+			() -> client.createIndex(indexUid, this.primaryKey)
+		);
+		client.deleteIndex(index.getUid());
+	}
+
 	/**
 	 * Test update Index PrimaryKey
 	 */

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

@@ -0,0 +1,51 @@
+package com.meilisearch.integration;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+
+import com.meilisearch.sdk.exceptions.MeiliSearchException;
+import com.meilisearch.sdk.exceptions.MeiliSearchApiException;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+@Tag("integration")
+public class ExceptionsTest extends AbstractIT {
+	
+
+	@BeforeEach
+	public void initialize() {
+		this.setUp();
+	}
+
+	@AfterAll
+	static void cleanMeiliSearch() {
+		cleanup();
+	}
+
+	/**
+	 * Test MeiliSearchApiError serialization and getters
+	 */
+	@Test
+	public void testErrorSerializeAndGetters() throws Exception {
+		String errorMessage = "You must have an authorization token";
+		String errorCode = "missing_authorization_header";
+		String errorType = "authentication_error";
+		String errorLink = "https://docs.meilisearch.com/errors#missing_authorization_header";
+		try {
+			throw new MeiliSearchApiException(
+				"{"
+				+ "\"message\":\"" + errorMessage + "\","
+				+ "\"errorCode\":\"" + errorCode + "\","
+				+ "\"errorType\":\"" + errorType + "\","
+				+ "\"errorLink\":\"" + errorLink + "\""
+				+ "}");
+		} catch (MeiliSearchApiException e) {
+			assertEquals(errorMessage, e.getMessage());
+			assertEquals(errorCode, e.getErrorCode());
+			assertEquals(errorType, e.getErrorType());
+			assertEquals(errorLink, e.getErrorLink());
+		}
+	}
+}