fix: scala

Author: shortcuts

clients/algoliasearch-client-scala/src/main/scala/algoliasearch/ApiClient.scala

@@ -6,6 +6,8 @@ import algoliasearch.internal.interceptor.{AuthInterceptor, RetryStrategy, UserA
 import algoliasearch.internal.{AlgoliaAgent, HttpRequester, StatefulHost}
 import org.json4s.Formats
 
+import java.util.concurrent.TimeUnit
+import scala.concurrent.duration.Duration
 import scala.util.Try
 
 /** Base class for all API clients. It provides a mechanism for request serialization and deserialization. It also
@@ -35,6 +37,9 @@ abstract class ApiClient(
     apiKey: String,
     clientName: String,
     defaultHosts: Seq[Host],
+    defaultReadTimeout: Duration,
+    defaultConnectTimeout: Duration,
+    defaultWriteTimeout: Duration,
     formats: Formats,
     options: ClientOptions = ClientOptions()
 ) extends AutoCloseable {
@@ -51,7 +56,16 @@ abstract class ApiClient(
   private val requester = options.customRequester match {
     case Some(customRequester) => customRequester
     case None =>
-      defaultRequester(appId, apiKey, clientName, options, defaultHosts)
+      defaultRequester(
+        appId,
+        apiKey,
+        clientName,
+        options,
+        defaultHosts,
+        defaultReadTimeout,
+        defaultConnectTimeout,
+        defaultWriteTimeout
+      )
   }
 
   private def defaultRequester(
@@ -69,13 +83,10 @@ abstract class ApiClient(
       .addSegments(options.agentSegments)
 
     val hosts = if (options.hosts.isEmpty) defaultHosts else options.hosts
-
-    option.readTimeout = Option(options.readTimeout).getOrElse(defaultReadTimeout)
-    option.writeTimeout = Option(options.writeTimeout).getOrElse(defaultWriteTimeout)
-    option.connectTimeout = Option(options.connectTimeout).getOrElse(defaultConnectTimeout)
-
     val statefulHosts = hosts.map(host => StatefulHost(host)).toList
 
+    options.withReadTimeout(Option(options.readTimeout).getOrElse(defaultReadTimeout)).withWriteTimeout(Option(options.writeTimeout).getOrElse(defaultWriteTimeout)).withConnectTimeout(Option(options.connectTimeout).getOrElse(defaultConnectTimeout))
+
     val builder = HttpRequester
       .builder(options.customFormats.getOrElse(formats))
       .withInterceptor(authInterceptor)

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

@@ -34,9 +34,9 @@ import scala.concurrent.duration.Duration
 case class ClientOptions(
     agentSegments: Seq[AgentSegment] = Seq.empty,
     hosts: Seq[Host] = Seq.empty,
-    connectTimeout: Option[Duration] = Duration(2, TimeUnit.SECONDS),
-    writeTimeout: Option[Duration] = Duration(30, TimeUnit.SECONDS),
-    readTimeout: Option[Duration] = Duration(5, TimeUnit.SECONDS),
+    connectTimeout: Duration = Duration(2, TimeUnit.SECONDS),
+    writeTimeout: Duration = Duration(30, TimeUnit.SECONDS),
+    readTimeout: Duration = Duration(5, TimeUnit.SECONDS),
     defaultHeaders: Map[String, String] = Map.empty,
     compressionType: CompressionType = CompressionType.None,
     logging: Option[Logging] = None,

templates/scala/api.mustache

@@ -9,9 +9,14 @@ import {{import}}
 import {{modelPackage}}._
 import algoliasearch.ApiClient
 import algoliasearch.api.{{classname}}.hosts
+import algoliasearch.api.{{classname}}.readTimeout
+import algoliasearch.api.{{classname}}.writeTimeout
+import algoliasearch.api.{{classname}}.connectTimeout
 import algoliasearch.config._
 import algoliasearch.internal.util._
 
+import java.util.concurrent.TimeUnit
+import scala.concurrent.duration.Duration
 import scala.concurrent.{ExecutionContext, Future}
 import scala.util.Random