Merge pull request #511 from algolia/fix-deleteobject-objectid

Fix: objectID is required to deleteObject

Author: julienbourdeau

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

@@ -810,6 +810,11 @@ <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 IllegalArgumentException("ObjectID must not be empty");
+    }
+
     Task result =
         httpClient.requestWithRetry(
             new AlgoliaRequest<>(

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

@@ -793,6 +793,11 @@ <T> CompletableFuture<AsyncTaskSingleIndex> saveObjects(
 
   CompletableFuture<AsyncTask> deleteObject(
       String indexName, String objectID, RequestOptions requestOptions) {
+
+    if (objectID.trim().length() == 0) {
+      throw new IllegalArgumentException("ObjectID must not be empty");
+    }
+
     return httpClient
         .requestWithRetry(
             new AlgoliaRequest<>(

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

@@ -132,4 +132,22 @@ public void getObjectsWithAttributesToRetrieve() throws Exception {
     futureAssertThat(result).hasSize(1);
     futureAssertThat(result).extracting("name").containsNull();
   }
+
+  @Test(expected = IllegalArgumentException.class)
+  public void deleteObjectEmptyObjectIdShouldFail() throws IllegalArgumentException {
+    AsyncIndex<AlgoliaObject> index = createIndex(AlgoliaObject.class);
+    index.deleteObject("");
+  }
+
+  @Test(expected = IllegalArgumentException.class)
+  public void deleteObjectWhiteSpaceObjectIdShouldFail() throws IllegalArgumentException {
+    AsyncIndex<AlgoliaObject> index = createIndex(AlgoliaObject.class);
+    index.deleteObject("  ");
+  }
+
+  @Test(expected = NullPointerException.class)
+  public void deleteObjectNullObjectIdShouldFail() throws NullPointerException {
+    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,24 @@ public void getObjectsWithAttributesToRetrieve() throws AlgoliaException {
     assertThat(objects.get(0))
         .isEqualToComparingFieldByField(new AlgoliaObjectWithID("1", null, 5));
   }
+
+  @Test(expected = IllegalArgumentException.class)
+  public void deleteObjectEmptyObjectIdShouldFail()
+      throws AlgoliaException, IllegalArgumentException {
+    Index<AlgoliaObject> index = createIndex(AlgoliaObject.class);
+    index.deleteObject("");
+  }
+
+  @Test(expected = IllegalArgumentException.class)
+  public void deleteObjectWhiteSpaceObjectIdShouldFail()
+      throws AlgoliaException, IllegalArgumentException {
+    Index<AlgoliaObject> index = createIndex(AlgoliaObject.class);
+    index.deleteObject("  ");
+  }
+
+  @Test(expected = NullPointerException.class)
+  public void deleteObjectNullObjectIdShouldFail() throws AlgoliaException, NullPointerException {
+    Index<AlgoliaObject> index = createIndex(AlgoliaObject.class);
+    index.deleteObject(null);
+  }
 }