feat(scala): endpoint level timeout

Author: Fluf22

clients/algoliasearch-client-scala/src/main/scala/algoliasearch/config/RequestOptions.scala

@@ -16,13 +16,27 @@ import scala.concurrent.duration.Duration
   *   HTTP read timeout
   * @param writeTimeout
   *   HTTP write timeout
+  * @param connectTimeout
+  *   HTTP connect timeout
   */
 case class RequestOptions(
     headers: Map[String, String] = Map.empty,
     queryParameters: Map[String, String] = Map.empty,
     readTimeout: Option[Duration] = None,
-    writeTimeout: Option[Duration] = None
-)
+    writeTimeout: Option[Duration] = None,
+    connectTimeout: Option[Duration] = None
+) {
+  def +(other: Option[RequestOptions]): RequestOptions = {
+    val some = other.getOrElse(return this)
+    new RequestOptions(
+      headers = this.headers ++ some.headers,
+      queryParameters = this.queryParameters ++ some.queryParameters,
+      readTimeout = some.readTimeout.orElse(this.readTimeout),
+      writeTimeout = some.writeTimeout.orElse(this.writeTimeout),
+      connectTimeout = some.connectTimeout.orElse(this.connectTimeout)
+    )
+  }
+}
 
 object RequestOptions {
 
@@ -33,6 +47,7 @@ object RequestOptions {
     private val queryParameters: mutable.Map[String, String] = mutable.Map()
     private var readTimeout: Option[Duration] = None
     private var writeTimeout: Option[Duration] = None
+    private var connectTimeout: Option[Duration] = None
 
     /** Adds a header to the request.
       */
@@ -62,14 +77,22 @@ object RequestOptions {
       this
     }
 
+    /** Sets the write timeout for the request.
+      */
+    def withConnectTimeout(connectTimeout: Option[Duration]): Builder = {
+      this.connectTimeout = connectTimeout
+      this
+    }
+
     /** Builds the [[RequestOptions]].
       */
     def build(): RequestOptions = {
       RequestOptions(
         headers = headers.toMap,
         queryParameters = queryParameters.toMap,
         readTimeout = readTimeout,
-        writeTimeout = writeTimeout
+        writeTimeout = writeTimeout,
+        connectTimeout = connectTimeout
       )
     }
   }

clients/algoliasearch-client-scala/src/main/scala/algoliasearch/internal/HttpRequester.scala

@@ -115,6 +115,7 @@ private[algoliasearch] class HttpRequester private (
     requestOptions.foreach(options => {
       options.readTimeout.foreach(timeout => builder.readTimeout(timeout.toMillis, TimeUnit.MILLISECONDS))
       options.writeTimeout.foreach(timeout => builder.writeTimeout(timeout.toMillis, TimeUnit.MILLISECONDS))
+      options.connectTimeout.foreach(timeout => builder.connectTimeout(timeout.toMillis, TimeUnit.MILLISECONDS))
     })
     builder.build
   }

generators/src/main/java/com/algolia/codegen/AlgoliaScalaGenerator.java

@@ -1,7 +1,9 @@
 package com.algolia.codegen;
 
 import com.algolia.codegen.exceptions.GeneratorException;
+import com.algolia.codegen.lambda.ToSecondsLambda;
 import com.algolia.codegen.utils.*;
+import com.google.common.collect.ImmutableMap;
 import com.samskivert.mustache.Mustache;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.Operation;
@@ -91,6 +93,11 @@ public void processOpts() {
     }
   }
 
+  @Override
+  protected ImmutableMap.Builder<String, Mustache.Lambda> addMustacheLambdas() {
+    return super.addMustacheLambdas().put("toSeconds", new ToSecondsLambda());
+  }
+
   /** Convert a Seq type to a valid class name. */
   private String typeToName(String content) {
     return content.trim().replace("[", "Of").replace("]", "").replace(".", "").replace(", ", "");

templates/scala/api.mustache

@@ -151,7 +151,7 @@ class {{classname}}(
       {{#vendorExtensions.x-use-read-transporter}}.withRead(true){{/vendorExtensions.x-use-read-transporter}}
       {{#vendorExtensions}}{{#queryParams}}{{^x-is-custom-request}}.withQueryParameter("{{baseName}}", {{paramName}}){{/x-is-custom-request}}{{#x-is-custom-request}}.withQueryParameters(parameters){{/x-is-custom-request}}{{/queryParams}}{{/vendorExtensions}}
       .build()
-    execute[{{#vendorExtensions}}{{#x-is-custom-request}}T{{/x-is-custom-request}}{{^x-is-custom-request}}{{{returnType}}}{{^returnType}}Unit{{/returnType}}{{/x-is-custom-request}}{{/vendorExtensions}}](request, requestOptions)
+    execute[{{#vendorExtensions}}{{#x-is-custom-request}}T{{/x-is-custom-request}}{{^x-is-custom-request}}{{{returnType}}}{{^returnType}}Unit{{/returnType}}{{/x-is-custom-request}}{{/vendorExtensions}}](request, {{#vendorExtensions.x-timeouts}}Some(RequestOptions(writeTimeout = Some(Duration({{#lambda.toSeconds}}{{{write}}}{{/lambda.toSeconds}}, TimeUnit.SECONDS)), readTimeout = Some(Duration({{#lambda.toSeconds}}{{{read}}}{{/lambda.toSeconds}}, TimeUnit.SECONDS)), connectTimeout = Some(Duration({{#lambda.toSeconds}}{{{connect}}}{{/lambda.toSeconds}}, TimeUnit.SECONDS))) + {{/vendorExtensions.x-timeouts}}requestOptions{{#vendorExtensions.x-timeouts}}){{/vendorExtensions.x-timeouts}})
   }
 
 {{/operation}}