feat: forward client opts

Author: shortcuts

clients/algoliasearch-client-java/algoliasearch/src/main/java/com/algolia/ApiClient.java

@@ -28,6 +28,7 @@ public abstract class ApiClient implements Closeable {
 
   private final Requester requester;
   private final ExecutorService executor;
+  public final ClientOptions clientOptions;
   public AuthInterceptor authInterceptor;
 
   /** Constructs a new instance of the {@link ApiClient}. */
@@ -47,11 +48,11 @@ protected ApiClient(
     if (apiKey == null || apiKey.isEmpty()) {
       throw new AlgoliaRuntimeException("`apiKey` is missing.");
     }
-    final ClientOptions clientOptions = options != null ? options : new ClientOptions();
-    this.executor = clientOptions.getExecutor();
-    this.requester = clientOptions.getCustomRequester() != null
-      ? clientOptions.getCustomRequester()
-      : defaultRequester(appId, apiKey, clientName, clientOptions, defaultHosts, connectTimeout, readTimeout, writeTimeout);
+    this.clientOptions = options != null ? options : new ClientOptions();
+    this.executor = this.clientOptions.getExecutor();
+    this.requester = this.clientOptions.getCustomRequester() != null
+      ? this.clientOptions.getCustomRequester()
+      : defaultRequester(appId, apiKey, clientName, this.clientOptions, defaultHosts, connectTimeout, readTimeout, writeTimeout);
   }
 
   /** Creates a default {@link Requester} for executing API requests. */

specs/search/helpers/partialUpdateObjectsWithTransformation.yml

@@ -5,6 +5,7 @@ method:
       - javascript
       - go
       - python
+      - java
     tags:
       - Records
     operationId: partialUpdateObjectsWithTransformation

templates/java/api.mustache

@@ -6,6 +6,7 @@ import {{invokerPackage}}.ApiClient;
 import {{invokerPackage}}.config.ClientOptions;
 
 import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import javax.annotation.Nullable;
 
 import okhttp3.Call;
@@ -56,7 +57,7 @@ public class {{classname}} extends ApiClient {
     private IngestionClient ingestionTransporter;
 
     public void setTransformationRegion(String region) {
-      this.ingestionTransporter = new IngestionClient(this.authInterceptor.getApplicationId(), this.authInterceptor.getApiKey(), region);
+      this.ingestionTransporter = new IngestionClient(this.authInterceptor.getApplicationId(), this.authInterceptor.getApiKey(), region, this.clientOptions);
     }
     {{/isSearchClient}}
 

templates/java/api_helpers.mustache

@@ -742,18 +742,17 @@ public <T> WatchResponse saveObjectsWithTransformation(
     );
 }
 
-private <T> List<PushTaskRecords> objectsToPushTaskRecords(Iterable<T> iterable) {
-  List<PushTaskRecords> payload = new ArrayList<>();
-  for (T item : iterable) {
-    if (item instanceof PushTaskRecords) {
-      payload.add((PushTaskRecords) item);
-    } else {
+private <T> List<PushTaskRecords> objectsToPushTaskRecords(Iterable<T> objects) {
+    try {
+        ObjectMapper mapper = new ObjectMapper();
+        String json = mapper.writeValueAsString(objects);
+
+        return mapper.readValue(json, new TypeReference<List<PushTaskRecords>>() {});
+    } catch (Exception e) {
       throw new AlgoliaRuntimeException(
         "each object must have an `objectID` key in order to be used with the" + " WithTransformation methods"
       );
     }
-  }
-  return payload;
 }
 
 /**

templates/java/tests/client/client.mustache

@@ -10,6 +10,9 @@ import com.algolia.EchoInterceptor;
 import com.algolia.EchoResponse;
 import com.algolia.api.{{client}};
 import com.algolia.model.{{import}}.*;
+{{#isSearchClient}}
+import com.algolia.model.ingestion.WatchResponse;
+{{/isSearchClient}}
 import com.algolia.config.*;
 import java.util.*;
 import java.time.Duration;

templates/java/tests/client/createClient.mustache

@@ -1 +1,2 @@
-{{^autoCreateClient}}{{client}} client = {{/autoCreateClient}}new {{client}}("{{parametersWithDataTypeMap.appId.value}}","{{parametersWithDataTypeMap.apiKey.value}}"{{#hasRegionalHost}}{{#parametersWithDataTypeMap.region}},"{{parametersWithDataTypeMap.region.value}}"{{/parametersWithDataTypeMap.region}}{{/hasRegionalHost}}{{#useEchoRequester}},withEchoRequester(){{/useEchoRequester}}{{#hasCustomHosts}},withCustomHosts(Arrays.asList({{#customHosts}}new Host("true".equals(System.getenv("CI")) ? "localhost" : "host.docker.internal", EnumSet.of(CallType.READ, CallType.WRITE), "http", {{port}}){{^-last}},{{/-last}}{{/customHosts}}), {{gzipEncoding}}){{/hasCustomHosts}});
+{{^autoCreateClient}}{{client}} client = {{/autoCreateClient}}new {{client}}("{{parametersWithDataTypeMap.appId.value}}","{{parametersWithDataTypeMap.apiKey.value}}"{{#hasRegionalHost}}{{#parametersWithDataTypeMap.region}},"{{parametersWithDataTypeMap.region.value}}"{{/parametersWithDataTypeMap.region}}{{/hasRegionalHost}}{{#useEchoRequester}},withEchoRequester(){{/useEchoRequester}}{{#hasCustomHosts}},withCustomHosts(Arrays.asList({{#customHosts}}new Host("true".equals(System.getenv("CI")) ? "localhost" : "host.docker.internal", EnumSet.of(CallType.READ, CallType.WRITE), "http", {{port}}){{^-last}},{{/-last}}{{/customHosts}}), {{gzipEncoding}}){{/hasCustomHosts}});
+{{#hasTransformationRegion}}client.setTransformationRegion("{{{transformationRegion}}}");{{/hasTransformationRegion}}