Added: objectID parameter validity check before calling deleteObject method

Author: Ant-hem

algoliasearch-common/src/main/java/com/algolia/search/APIClient.java

@@ -807,6 +807,12 @@ <T> TaskSingleIndex saveObjects(String indexName, List<T> objects, RequestOption
 
   Task deleteObject(String indexName, String objectID, RequestOptions requestOptions)
       throws AlgoliaException {
+
+    if (objectID.trim().length() == 0)
+    {
+      throw new AlgoliaException("ObjectID must not be empty");
+    }
+
     Task result =
         httpClient.requestWithRetry(
             new AlgoliaRequest<>(

algoliasearch-common/src/main/java/com/algolia/search/AsyncAPIClient.java

@@ -788,8 +788,14 @@ <T> CompletableFuture<AsyncTaskSingleIndex> saveObjects(
         .thenApply(s -> s.setIndex(indexName));
   }
 
-  CompletableFuture<AsyncTask> deleteObject(
-      String indexName, String objectID, RequestOptions requestOptions) {
+  CompletableFuture<AsyncTask> deleteObject (
+      String indexName, String objectID, RequestOptions requestOptions) throws AlgoliaException {
+
+    if (objectID.trim().length() == 0)
+    {
+      throw new AlgoliaException("ObjectID must not be empty");
+    }
+
     return httpClient
         .requestWithRetry(
             new AlgoliaRequest<>(

algoliasearch-common/src/main/java/com/algolia/search/AsyncObjects.java

@@ -1,5 +1,6 @@
 package com.algolia.search;
 
+import com.algolia.search.exceptions.AlgoliaException;
 import com.algolia.search.objects.RequestOptions;
 import com.algolia.search.objects.tasks.async.AsyncTask;
 import com.algolia.search.objects.tasks.async.AsyncTaskIndexing;
@@ -206,7 +207,7 @@ default CompletableFuture<AsyncTaskSingleIndex> saveObjects(
    * @param objectID the unique identifier of the object to retrieve
    * @return the associated AsyncTask
    */
-  default CompletableFuture<AsyncTask> deleteObject(@Nonnull String objectID) {
+  default CompletableFuture<AsyncTask> deleteObject(@Nonnull String objectID) throws AlgoliaException {
     return deleteObject(objectID, RequestOptions.empty);
   }
 
@@ -217,8 +218,8 @@ default CompletableFuture<AsyncTask> deleteObject(@Nonnull String objectID) {
    * @param requestOptions Options to pass to this request
    * @return the associated AsyncTask
    */
-  default CompletableFuture<AsyncTask> deleteObject(
-      @Nonnull String objectID, @Nonnull RequestOptions requestOptions) {
+  default CompletableFuture<AsyncTask> deleteObject (
+      @Nonnull String objectID, @Nonnull RequestOptions requestOptions) throws AlgoliaException {
     return getApiClient().deleteObject(getName(), objectID, requestOptions);
   }
 

algoliasearch-tests/src/test/java/com/algolia/search/integration/common/async/AsyncObjectsTest.java

@@ -11,6 +11,8 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
+
+import com.algolia.search.exceptions.AlgoliaException;
 import org.junit.Test;
 
 @SuppressWarnings("ConstantConditions")
@@ -132,4 +134,22 @@ public void getObjectsWithAttributesToRetrieve() throws Exception {
     futureAssertThat(result).hasSize(1);
     futureAssertThat(result).extracting("name").containsNull();
   }
+
+  @Test(expected = AlgoliaException.class)
+  public void deleteObjectEmptyObjectIdShouldFail() throws AlgoliaException {
+    AsyncIndex<AlgoliaObject> index = createIndex(AlgoliaObject.class);
+    index.deleteObject("");
+  }
+
+  @Test(expected = AlgoliaException.class)
+  public void deleteObjectWhiteSpaceObjectIdShouldFail() throws AlgoliaException {
+    AsyncIndex<AlgoliaObject> index = createIndex(AlgoliaObject.class);
+    index.deleteObject("  ");
+  }
+
+  @Test(expected = NullPointerException.class)
+  public void deleteObjectNullObjectIdShouldFail() throws AlgoliaException {
+    AsyncIndex<AlgoliaObject> index = createIndex(AlgoliaObject.class);
+    index.deleteObject(null);
+  }
 }

algoliasearch-tests/src/test/java/com/algolia/search/integration/common/sync/SyncObjectsTest.java

@@ -130,4 +130,22 @@ public void getObjectsWithAttributesToRetrieve() throws AlgoliaException {
     assertThat(objects.get(0))
         .isEqualToComparingFieldByField(new AlgoliaObjectWithID("1", null, 5));
   }
+
+  @Test(expected = AlgoliaException.class)
+  public void deleteObjectEmptyObjectIdShouldFail() throws AlgoliaException {
+    Index<AlgoliaObject> index = createIndex(AlgoliaObject.class);
+    index.deleteObject("");
+  }
+
+  @Test(expected = AlgoliaException.class)
+  public void deleteObjectWhiteSpaceObjectIdShouldFail() throws AlgoliaException {
+    Index<AlgoliaObject> index = createIndex(AlgoliaObject.class);
+    index.deleteObject("  ");
+  }
+
+  @Test(expected = NullPointerException.class)
+  public void deleteObjectNullObjectIdShouldFail() throws AlgoliaException {
+    Index<AlgoliaObject> index = createIndex(AlgoliaObject.class);
+    index.deleteObject(null);
+  }
 }