fix review

algolia · Aug 23, 2017 · 73f304e · 73f304e
1 parent 0bf1a71
commit 73f304e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/algoliasearch-common/src/main/java/com/algolia/search/APIClient.java b/algoliasearch-common/src/main/java/com/algolia/search/APIClient.java
@@ -979,7 +979,7 @@ Task deleteBy(String indexName, Query query, RequestOptions requestOptions) thro
     )
       .setData(query);
 
-    return httpClient.requestWithRetry(algoliaRequest);
+    return httpClient.requestWithRetry(algoliaRequest).setIndex(indexName).setAPIClient(this);
   }
 
   TaskSingleIndex partialUpdateObjects(String indexName, List<Object> objects, RequestOptions requestOptions) throws AlgoliaException {

diff --git a/algoliasearch-common/src/main/java/com/algolia/search/Index.java b/algoliasearch-common/src/main/java/com/algolia/search/Index.java
@@ -1433,7 +1433,7 @@ interface DeleteByQuery<T> extends BaseSyncIndex<T> {
 
   /**
    * Delete records matching a query, with a batch size of 1000, internally uses browse
-   * Deprecated, use deleteBy
+   * @deprecated, use deleteBy
    *
    * @param query The query
    * @throws AlgoliaException
@@ -1455,7 +1455,7 @@ default Task deleteBy(@Nonnull Query query) throws AlgoliaException {
 
   /**
    * Delete records matching a query, with a batch size of 1000, internally uses browse
-   * Deprecated, use deleteBy
+   * @deprecated, use deleteBy
    *
    * @param query          The query
    * @param requestOptions Options to pass to this request
@@ -1468,7 +1468,6 @@ default void deleteByQuery(@Nonnull Query query, @Nonnull RequestOptions request
 
   /**
    * Delete records matching a query
-   * Deprecated, use deleteBy
    *
    * @param query          The query
    * @param requestOptions Options to pass to this request
@@ -1480,7 +1479,7 @@ default Task deleteBy(@Nonnull Query query, @Nonnull RequestOptions requestOptio
 
   /**
    * Delete records matching a query, internally uses browse
-   * Deprecated use deleteBy
+   * @deprecated use deleteBy
    *
    * @param query     The query
    * @param batchSize the size of the batches
@@ -1493,7 +1492,7 @@ default void deleteByQuery(@Nonnull Query query, int batchSize) throws AlgoliaEx
 
   /**
    * Delete records matching a query, internally uses browse
-   * Deprecated use deleteBy
+   * @deprecated use deleteBy
    *
    * @param query          The query
    * @param batchSize      the size of the batches

diff --git a/...iasearch-common/src/test/java/com/algolia/search/integration/async/AsyncDeleteByTest.java b/...iasearch-common/src/test/java/com/algolia/search/integration/async/AsyncDeleteByTest.java
@@ -12,6 +12,7 @@
 import org.junit.Test;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
@@ -38,11 +39,11 @@ public void deleteBy() throws Exception {
     List<AlgoliaObject> objects = IntStream.rangeClosed(1, 10).mapToObj(i -> new AlgoliaObject("name" + i, i)).collect(Collectors.toList());
     waitForCompletion(index.addObjects(objects));
 
-    waitForCompletion(index.deleteBy(new Query("")));
+    waitForCompletion(index.deleteBy(new Query().setTagFilters(Collections.singletonList("a"))));
 
     SearchResult<AlgoliaObject> search = index.search(new Query("")).get();
 
-    assertThat(search.getHits()).isEmpty();
+    assertThat(search.getHits()).hasSize(10);
   }
 
 }
diff --git a/algoliasearch-common/src/test/java/com/algolia/search/integration/sync/SyncDeleteByTest.java b/algoliasearch-common/src/test/java/com/algolia/search/integration/sync/SyncDeleteByTest.java
@@ -12,6 +12,7 @@
 import org.junit.Test;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
@@ -66,9 +67,9 @@ public void deleteBy() throws AlgoliaException {
     List<AlgoliaObject> objects = IntStream.rangeClosed(1, 10).mapToObj(i -> new AlgoliaObject("name" + i, i)).collect(Collectors.toList());
     index.addObjects(objects).waitForCompletion();
 
-    index.deleteBy(new Query("")).waitForCompletion();
+    index.deleteBy(new Query().setTagFilters(Collections.singletonList("a"))).waitForCompletion();
 
-    assertThat(index.search(new Query("")).getHits()).isEmpty();
+    assertThat(index.search(new Query("")).getHits()).hasSize(10);
   }
 
 }