fix(java): catch null exception for ClientOptions APIC-537 (#703)

Author: millotp

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

@@ -37,7 +37,7 @@ public ApiClient(String appId, String apiKey, String clientName, String version,
 
     this.algoliaAgent = new AlgoliaAgent(version);
     this.algoliaAgent.addSegment(new AlgoliaAgent.Segment(clientName, version));
-    if (options.getAlgoliaAgentSegments() != null) {
+    if (options != null && options.getAlgoliaAgentSegments() != null) {
       for (AlgoliaAgent.Segment segment : options.getAlgoliaAgentSegments()) {
         this.algoliaAgent.addSegment(segment);
       }
@@ -49,8 +49,9 @@ public ApiClient(String appId, String apiKey, String clientName, String version,
     addDefaultHeader("Accept", this.contentType);
     addDefaultHeader("Content-Type", this.contentType);
 
-    this.requester = options.getRequester();
-    if (this.requester == null) {
+    if (options != null && options.getRequester() != null) {
+      this.requester = options.getRequester();
+    } else {
       this.requester = new HttpRequester();
     }
   }

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

@@ -10,14 +10,10 @@ public class ClientOptions {
   private List<AlgoliaAgent.Segment> algoliaAgentSegments;
   private List<StatefulHost> hosts;
 
-  private ClientOptions() {
+  public ClientOptions() {
     algoliaAgentSegments = new ArrayList<>();
   }
 
-  public static ClientOptions build() {
-    return new ClientOptions();
-  }
-
   public Requester getRequester() {
     return this.requester;
   }

playground/java/src/main/java/com/algolia/playground/Search.java

@@ -26,8 +26,7 @@ public static void main(String[] args) {
     SearchClient client = new SearchClient(
       dotenv.get("ALGOLIA_APPLICATION_ID"),
       dotenv.get("ALGOLIA_ADMIN_KEY"),
-      ClientOptions
-        .build()
+      new ClientOptions()
         .addAlgoliaAgentSegment("test", "8.0.0")
         .addAlgoliaAgentSegment("JVM", "11.0.14")
         .addAlgoliaAgentSegment("no version")

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

@@ -48,10 +48,10 @@ public class {{classname}} extends ApiClient {
 
     public {{classname}}(String appId, String apiKey, String region, ClientOptions options) {
       super(appId, apiKey, "{{{baseName}}}", "{{{packageVersion}}}", options);
-      if (options.getHosts() == null) {
-        this.setHosts(getDefaultHosts(region));
-      } else {
+      if (options != null && options.getHosts() != null) {
         this.setHosts(options.getHosts());
+      } else {
+        this.setHosts(getDefaultHosts(region));
       }
       this.setConnectTimeout(2000);
       this.setReadTimeout(5000);
@@ -65,11 +65,11 @@ public class {{classname}} extends ApiClient {
     }
 
     public {{classname}}(String appId, String apiKey, ClientOptions options) {
-        super(appId, apiKey, "{{{baseName}}}", "{{{packageVersion}}}", options);
-      if (options.getHosts() == null) {
-        this.setHosts(getDefaultHosts(appId));
-      } else {
+      super(appId, apiKey, "{{{baseName}}}", "{{{packageVersion}}}", options);
+      if (options != null && options.getHosts() != null) {
         this.setHosts(options.getHosts());
+      } else {
+        this.setHosts(getDefaultHosts(appId));
       }
       this.setConnectTimeout(2000);
       this.setReadTimeout(5000);

templates/java/tests/client/createClient.mustache

@@ -1 +1 @@
-{{^autoCreateClient}}{{client}} $client = {{/autoCreateClient}}new {{client}}("{{parametersWithDataTypeMap.appId.value}}","{{parametersWithDataTypeMap.apiKey.value}}",{{#hasRegionalHost}}{{#parametersWithDataTypeMap.region}}"{{parametersWithDataTypeMap.region.value}}",{{/parametersWithDataTypeMap.region}}{{/hasRegionalHost}}ClientOptions.build().setRequester(requester));
+{{^autoCreateClient}}{{client}} $client = {{/autoCreateClient}}new {{client}}("{{parametersWithDataTypeMap.appId.value}}","{{parametersWithDataTypeMap.apiKey.value}}",{{#hasRegionalHost}}{{#parametersWithDataTypeMap.region}}"{{parametersWithDataTypeMap.region.value}}",{{/parametersWithDataTypeMap.region}}{{/hasRegionalHost}}new ClientOptions().setRequester(requester));

templates/java/tests/client/suite.mustache

@@ -29,7 +29,7 @@ class {{client}}ClientTests {
   }
 
   {{client}} createClient() {
-      return new {{client}}("appId", "apiKey", {{#hasRegionalHost}}"{{defaultRegion}}", {{/hasRegionalHost}}ClientOptions.build().setRequester(requester));
+      return new {{client}}("appId", "apiKey", {{#hasRegionalHost}}"{{defaultRegion}}", {{/hasRegionalHost}}new ClientOptions().setRequester(requester));
   }
 
   {{#blocksClient}}

templates/java/tests/requests/requests.mustache

@@ -34,7 +34,7 @@ class {{client}}RequestsTests {
         HttpRequester requester = new HttpRequester();
         echo = new EchoInterceptor();
         requester.addInterceptor(echo.getEchoInterceptor());
-        client = new {{client}}("appId", "apiKey", {{#hasRegionalHost}}"{{defaultRegion}}", {{/hasRegionalHost}}ClientOptions.build().setRequester(requester));
+        client = new {{client}}("appId", "apiKey", {{#hasRegionalHost}}"{{defaultRegion}}", {{/hasRegionalHost}}new ClientOptions().setRequester(requester));
     }
 
     {{#blocksRequests}}

website/docs/clients/guides/customized-client-usage.mdx

@@ -126,7 +126,7 @@ import com.algolia.api.SearchClient;
 SearchClient client = new SearchClient(
   "<YOUR_APP_ID>", 
   "<YOUR_API_KEY>",
-  ClientOptions.build().addAlgoliaAgentSegments("my user agent", "optional version")
+  new ClientOptions().addAlgoliaAgentSegments("my user agent", "optional version")
 );
 ```
 
@@ -164,7 +164,7 @@ import com.algolia.api.SearchClient;
 SearchClient client = new SearchClient(
   "<YOUR_APP_ID>", 
   "<YOUR_API_KEY>",
-  ClientOptions.build().setRequester(new MyOwnRequester())
+  new ClientOptions().setRequester(new MyOwnRequester())
 );
 ```