From f5ec837e69d00ca33bf50a375961a45e85fa0f17 Mon Sep 17 00:00:00 2001 From: larskristianhaga Date: Wed, 10 Jul 2024 11:37:09 +0200 Subject: [PATCH 1/6] Moved class `TaskError` to the model package. --- src/main/java/com/meilisearch/sdk/{ => model}/TaskError.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename src/main/java/com/meilisearch/sdk/{ => model}/TaskError.java (89%) diff --git a/src/main/java/com/meilisearch/sdk/TaskError.java b/src/main/java/com/meilisearch/sdk/model/TaskError.java similarity index 89% rename from src/main/java/com/meilisearch/sdk/TaskError.java rename to src/main/java/com/meilisearch/sdk/model/TaskError.java index 2b63c3c9..d70f6244 100644 --- a/src/main/java/com/meilisearch/sdk/TaskError.java +++ b/src/main/java/com/meilisearch/sdk/model/TaskError.java @@ -1,4 +1,4 @@ -package com.meilisearch.sdk; +package com.meilisearch.sdk.model; import lombok.Getter; import lombok.Setter; From d07d3d41e9a7f84ef447d3dca2bb9500ba0ab5c9 Mon Sep 17 00:00:00 2001 From: larskristianhaga Date: Wed, 10 Jul 2024 11:37:59 +0200 Subject: [PATCH 2/6] Renamed the fields to match the API response, and added a missing field called `message`. --- src/main/java/com/meilisearch/sdk/model/TaskError.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/meilisearch/sdk/model/TaskError.java b/src/main/java/com/meilisearch/sdk/model/TaskError.java index d70f6244..9bdd8047 100644 --- a/src/main/java/com/meilisearch/sdk/model/TaskError.java +++ b/src/main/java/com/meilisearch/sdk/model/TaskError.java @@ -3,14 +3,15 @@ import lombok.Getter; import lombok.Setter; -/** The code, type and error of the task error */ +/** The code, type‚ error and message of the task error */ @Getter @Setter public class TaskError { public TaskError() {} - protected String taskErrorCode = ""; - protected String taskErrorType = ""; - protected String taskErrorLink = ""; + protected String code = ""; + protected String type = ""; + protected String link = ""; + protected String message = ""; } From 395a223a8e04fd13c3afe1a094d0650413193f5a Mon Sep 17 00:00:00 2001 From: larskristianhaga Date: Wed, 10 Jul 2024 11:38:35 +0200 Subject: [PATCH 3/6] Updated imports for the class that uses the `TaskError` class. --- src/main/java/com/meilisearch/sdk/model/Task.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/meilisearch/sdk/model/Task.java b/src/main/java/com/meilisearch/sdk/model/Task.java index 288f478e..fe1940d0 100644 --- a/src/main/java/com/meilisearch/sdk/model/Task.java +++ b/src/main/java/com/meilisearch/sdk/model/Task.java @@ -1,6 +1,5 @@ package com.meilisearch.sdk.model; -import com.meilisearch.sdk.TaskError; import java.util.Date; import lombok.Getter; From bb44f0a23794179338ebfa4d31d5ea31e734978c Mon Sep 17 00:00:00 2001 From: larskristianhaga Date: Wed, 10 Jul 2024 11:39:24 +0200 Subject: [PATCH 4/6] Updated the Exceptions integration test to use the correct naming, and import. --- .../java/com/meilisearch/integration/ExceptionsTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/java/com/meilisearch/integration/ExceptionsTest.java b/src/test/java/com/meilisearch/integration/ExceptionsTest.java index 5004424c..96b5ceae 100644 --- a/src/test/java/com/meilisearch/integration/ExceptionsTest.java +++ b/src/test/java/com/meilisearch/integration/ExceptionsTest.java @@ -8,10 +8,10 @@ import com.meilisearch.integration.classes.AbstractIT; import com.meilisearch.sdk.Client; import com.meilisearch.sdk.Config; -import com.meilisearch.sdk.TaskError; import com.meilisearch.sdk.exceptions.APIError; import com.meilisearch.sdk.exceptions.MeilisearchApiException; import com.meilisearch.sdk.exceptions.MeilisearchCommunicationException; +import com.meilisearch.sdk.model.TaskError; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Tag; @@ -60,8 +60,8 @@ public void testErrorSerializeAndGetters() { @Test public void testTaskErrorGetters() { TaskError error = new TaskError(); - error.setTaskErrorCode("wrong field"); - assertThat(error.getTaskErrorCode(), is(equalTo("wrong field"))); + error.setCode("wrong field"); + assertThat(error.getCode(), is(equalTo("wrong field"))); } /** Test MeilisearchApiException is thrown on Meilisearch bad request */ From 33b7c102c33d9eb7802568c67394e2fd275e5913 Mon Sep 17 00:00:00 2001 From: larskristianhaga Date: Wed, 10 Jul 2024 16:15:50 +0200 Subject: [PATCH 5/6] Added integration test for checking that a tasks error has values --- .../meilisearch/integration/TasksTest.java | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/src/test/java/com/meilisearch/integration/TasksTest.java b/src/test/java/com/meilisearch/integration/TasksTest.java index 6b655dad..c415d56e 100644 --- a/src/test/java/com/meilisearch/integration/TasksTest.java +++ b/src/test/java/com/meilisearch/integration/TasksTest.java @@ -88,6 +88,48 @@ public void testClientGetTasksLimit() throws Exception { assertThat(result.getResults().length, is(notNullValue())); } + /** Test Get Task Error Values */ + @Test + public void testClientGetTaskErrorValues() throws Exception { + String indexUid = "CheckTaskErrorValues"; + Index index = client.index(indexUid); + + // Deleting all documents from an index that does not exist results in a task error. + TaskInfo taskInfo = index.deleteAllDocuments(); + index.waitForTask(taskInfo.getTaskUid()); + + Task task = client.getTask(taskInfo.getTaskUid()); + + assertThat(task.getError(), is(notNullValue())); + assertThat(task.getError().getCode(), is(notNullValue())); + assertThat(task.getError().getType(), is(notNullValue())); + assertThat(task.getError().getLink(), is(notNullValue())); + assertThat(task.getError().getMessage(), is(notNullValue())); + } + + /** Test Get Task Error Values When Adding Documents */ + @Test + public void testClientGetTaskErrorWhenAddingDocuments() throws Exception { + String indexUid = "CheckTaskErrorWhenAddingDocuments"; + Index index = client.index(indexUid); + + TaskInfo taskInfo = client.createIndex(indexUid); + client.waitForTask(taskInfo.getTaskUid()); + + String json = "{\"identifyer\": 1, \"name\": \"Donald Duck\"}"; + // Adding a document with a wrong identifier results in a task error. + TaskInfo taskInfoAddDocuments = index.addDocuments(json, "identifier"); + client.waitForTask(taskInfoAddDocuments.getTaskUid()); + + Task task = client.getTask(taskInfoAddDocuments.getTaskUid()); + + assertThat(task.getError(), is(notNullValue())); + assertThat(task.getError().getCode(), is(notNullValue())); + assertThat(task.getError().getType(), is(notNullValue())); + assertThat(task.getError().getLink(), is(notNullValue())); + assertThat(task.getError().getMessage(), is(notNullValue())); + } + /** Test Get Tasks with limit and from */ @Test public void testClientGetTasksLimitAndFrom() throws Exception { From 725a05f5bfd05d02ce1f51bb518b116452a1cdc0 Mon Sep 17 00:00:00 2001 From: larskristianhaga Date: Wed, 10 Jul 2024 16:24:47 +0200 Subject: [PATCH 6/6] Updated Integration tests to check for not blank value. --- .../com/meilisearch/integration/TasksTest.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/test/java/com/meilisearch/integration/TasksTest.java b/src/test/java/com/meilisearch/integration/TasksTest.java index c415d56e..785923c3 100644 --- a/src/test/java/com/meilisearch/integration/TasksTest.java +++ b/src/test/java/com/meilisearch/integration/TasksTest.java @@ -1,10 +1,12 @@ package com.meilisearch.integration; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.blankOrNullString; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThanOrEqualTo; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -101,10 +103,10 @@ public void testClientGetTaskErrorValues() throws Exception { Task task = client.getTask(taskInfo.getTaskUid()); assertThat(task.getError(), is(notNullValue())); - assertThat(task.getError().getCode(), is(notNullValue())); - assertThat(task.getError().getType(), is(notNullValue())); - assertThat(task.getError().getLink(), is(notNullValue())); - assertThat(task.getError().getMessage(), is(notNullValue())); + assertThat(task.getError().getCode(), not(blankOrNullString())); + assertThat(task.getError().getType(), not(blankOrNullString())); + assertThat(task.getError().getLink(), not(blankOrNullString())); + assertThat(task.getError().getMessage(), not(blankOrNullString())); } /** Test Get Task Error Values When Adding Documents */ @@ -124,10 +126,10 @@ public void testClientGetTaskErrorWhenAddingDocuments() throws Exception { Task task = client.getTask(taskInfoAddDocuments.getTaskUid()); assertThat(task.getError(), is(notNullValue())); - assertThat(task.getError().getCode(), is(notNullValue())); - assertThat(task.getError().getType(), is(notNullValue())); - assertThat(task.getError().getLink(), is(notNullValue())); - assertThat(task.getError().getMessage(), is(notNullValue())); + assertThat(task.getError().getCode(), not(blankOrNullString())); + assertThat(task.getError().getType(), not(blankOrNullString())); + assertThat(task.getError().getLink(), not(blankOrNullString())); + assertThat(task.getError().getMessage(), not(blankOrNullString())); } /** Test Get Tasks with limit and from */