review

Author: millotp

clients/algoliasearch-client-java-2/algoliasearch-core/src/main/java/com/algolia/utils/TaskUtils.java

@@ -9,6 +9,11 @@
 
 public class TaskUtils {
 
+  public static final int DEFAULT_MAX_TRIAL = 50;
+  public static final IntUnaryOperator DEFAULT_TIMEOUT = (int retries) -> {
+    return Math.min(retries * 200, 5000);
+  };
+
   public static <TResponse> void retryUntil(
     Supplier<CompletableFuture<TResponse>> func,
     Predicate<TResponse> validate,
@@ -19,7 +24,6 @@ public static <TResponse> void retryUntil(
     while (retryCount < maxTrial) {
       try {
         TResponse resp = func.get().get();
-        System.out.println(resp);
         if (validate.test(resp)) {
           return;
         }
@@ -28,7 +32,6 @@ public static <TResponse> void retryUntil(
         return;
       }
       try {
-        System.out.println("sleeping for " + timeout.applyAsInt(retryCount));
         Thread.sleep(timeout.applyAsInt(retryCount));
       } catch (InterruptedException ignored) {
         // Restore interrupted state...
@@ -45,18 +48,4 @@ public static <TResponse> void retryUntil(
       ")"
     );
   }
-
-  public static <TResponse> void retryUntil(
-    Supplier<CompletableFuture<TResponse>> func,
-    Predicate<TResponse> validate
-  ) {
-    retryUntil(
-      func,
-      validate,
-      50,
-      (int retries) -> {
-        return Math.min(retries * 200, 5000);
-      }
-    );
-  }
 }

clients/algoliasearch-client-javascript/packages/client-common/src/createRetryablePromise.ts

@@ -1,5 +1,9 @@
 import type { CreateRetryablePromiseOptions } from './types/CreateRetryablePromise';
 
+export const DEFAULT_MAX_TRIAL = 50;
+export const DEFAULT_TIMEOUT = (retryCount: number): number =>
+  Math.min(retryCount * 200, 5000);
+
 /**
  * Return a promise that retry a task until it meets the condition.
  *
@@ -12,8 +16,8 @@ import type { CreateRetryablePromiseOptions } from './types/CreateRetryablePromi
 export function createRetryablePromise<TResponse>({
   func,
   validate,
-  maxTrial = 50,
-  timeout = (retryCount: number): number => Math.min(retryCount * 200, 5000),
+  maxTrial = DEFAULT_MAX_TRIAL,
+  timeout = DEFAULT_TIMEOUT,
 }: CreateRetryablePromiseOptions<TResponse>): Promise<TResponse> {
   let retryCount = 0;
   const retry = (): Promise<TResponse> => {

templates/java/libraries/okhttp-gson/api.mustache

@@ -13,6 +13,7 @@ import com.algolia.exceptions.*;
 import com.algolia.utils.retry.CallType;
 import com.algolia.utils.retry.StatefulHost;
 import com.algolia.utils.RequestOptions;
+import java.util.function.IntUnaryOperator;
 
 import java.util.EnumSet;
 import java.util.Random;
@@ -218,16 +219,24 @@ public class {{classname}} extends ApiClient {
   {{/operation}}
 
   {{#isSearchClient}}
-  public void waitForTask(String indexName, Long taskID, RequestOptions requestOptions) {
+  public void waitForTask(String indexName, Long taskID, RequestOptions requestOptions, int maxTrial, IntUnaryOperator timeout) {
     TaskUtils.retryUntil(() -> {
       return this.getTaskAsync(indexName, taskID, requestOptions);
     }, (GetTaskResponse task) -> {
       return task.getStatus() == TaskStatus.PUBLISHED;
-    });
+    }, maxTrial, timeout);
+  }
+
+  public void waitForTask(String indexName, Long taskID, RequestOptions requestOptions) {
+    this.waitForTask(indexName, taskID, requestOptions, TaskUtils.DEFAULT_MAX_TRIAL, TaskUtils.DEFAULT_TIMEOUT);
+  }
+
+  public void waitForTask(String indexName, Long taskID, int maxTrial, IntUnaryOperator timeout) {
+    this.waitForTask(indexName, taskID, null, maxTrial, timeout);
   }
 
   public void waitForTask(String indexName, Long taskID) {
-    this.waitForTask(indexName, taskID, null);
+    this.waitForTask(indexName, taskID, null, TaskUtils.DEFAULT_MAX_TRIAL, TaskUtils.DEFAULT_TIMEOUT);
   }
   {{/isSearchClient}}
 }