wip: change non-generated files dir

algolia · Mar 14, 2023 · d5d1dc6 · d5d1dc6
1 parent 7bd2d16
commit d5d1dc6
Show file tree

Hide file tree

Showing 24 changed files with 164 additions and 162 deletions.
diff --git a/.../algolia/search/configuration/CallType.kt → ....algolia.client/configuration/CallType.kt b/.../algolia/search/configuration/CallType.kt → ....algolia.client/configuration/CallType.kt
@@ -1,4 +1,4 @@
-package com.algolia.search.configuration
+package com.algolia.client.configuration
 
 /**
  * Indicate whether the HTTP call performed is of type [Read] (GET) or [Write] (POST, PUT ..).

diff --git a/...lia/search/configuration/Configuration.kt → ...lia.client/configuration/Configuration.kt b/...lia/search/configuration/Configuration.kt → ...lia.client/configuration/Configuration.kt
@@ -1,8 +1,7 @@
-package com.algolia.search.configuration
+package com.algolia.client.configuration
 
-import com.algolia.search.logging.LogLevel
-import com.algolia.search.logging.Logger
-import com.algolia.search.transport.RequestOptions
+import com.algolia.client.logging.LogLevel
+import com.algolia.client.logging.Logger
 import io.ktor.client.HttpClient
 import io.ktor.client.HttpClientConfig
 import io.ktor.client.engine.HttpClientEngine

diff --git a/...golia/search/configuration/Credentials.kt → ...golia.client/configuration/Credentials.kt b/...golia/search/configuration/Credentials.kt → ...golia.client/configuration/Credentials.kt
@@ -1,7 +1,7 @@
-package com.algolia.search.configuration
+package com.algolia.client.configuration
 
-import com.algolia.search.model.APIKey
-import com.algolia.search.model.ApplicationID
+import com.algolia.client.model.APIKey
+import com.algolia.client.model.ApplicationID
 
 /**
  * Configuration used by a client for authenticated request.

diff --git a/.../com/algolia/search/configuration/Host.kt → .../com.algolia.client/configuration/Host.kt b/.../com/algolia/search/configuration/Host.kt → .../com.algolia.client/configuration/Host.kt
@@ -1,4 +1,4 @@
-package com.algolia.search.configuration
+package com.algolia.client.configuration
 
 /**
  * @param url The url to target.

diff --git a/...algolia/search/configuration/UserAgent.kt → ...algolia.client/configuration/UserAgent.kt b/...algolia/search/configuration/UserAgent.kt → ...algolia.client/configuration/UserAgent.kt
@@ -1,4 +1,4 @@
-package com.algolia.search.configuration
+package com.algolia.client.configuration
 
 /**
  * Get algolia client user agent.

diff --git a/...arch/exception/AlgoliaRuntimeException.kt → ...ient/exception/AlgoliaRuntimeException.kt b/...arch/exception/AlgoliaRuntimeException.kt → ...ient/exception/AlgoliaRuntimeException.kt
@@ -1,4 +1,4 @@
-package com.algolia.search.exception
+package com.algolia.client.exception
 
 /**
  * Algolia runtime exception.
@@ -7,8 +7,8 @@ package com.algolia.search.exception
  * @param cause the cause of the exception
  */
 public sealed class AlgoliaRuntimeException(
-    message: String? = null,
-    cause: Throwable? = null
+  message: String? = null,
+  cause: Throwable? = null
 ) : RuntimeException(message, cause)
 
 /**
@@ -18,8 +18,8 @@ public sealed class AlgoliaRuntimeException(
  * @param cause the cause of the exception
  */
 public class AlgoliaClientException(
-    message: String? = null,
-    cause: Throwable? = null
+  message: String? = null,
+  cause: Throwable? = null
 ) : AlgoliaRuntimeException(message, cause)
 
 /**
@@ -30,9 +30,9 @@ public class AlgoliaClientException(
  * @param httpErrorCode
  */
 public class AlgoliaApiException(
-    message: String? = null,
-    cause: Throwable? = null,
-    public val httpErrorCode: Int? = null
+  message: String? = null,
+  cause: Throwable? = null,
+  public val httpErrorCode: Int? = null
 ) : AlgoliaRuntimeException(message, cause)
 
 /**
@@ -42,5 +42,5 @@ public class AlgoliaApiException(
  * @param exceptions list of thrown exceptions
  */
 public class UnreachableHostsException(
-    public val exceptions: List<Throwable>,
+  public val exceptions: List<Throwable>,
 ) : AlgoliaRuntimeException("Error(s) while processing the retry strategy", exceptions.last())
diff --git a/...ia/search/exception/EmptyListException.kt → ...ia.client/exception/EmptyListException.kt b/...ia/search/exception/EmptyListException.kt → ...ia.client/exception/EmptyListException.kt
@@ -1,4 +1,4 @@
-package com.algolia.search.exception
+package com.algolia.client.exception
 
 /**
  * This exception is thrown when an illegal empty [List] is encountered.

diff --git a/.../search/exception/EmptyStringException.kt → ....client/exception/EmptyStringException.kt b/.../search/exception/EmptyStringException.kt → ....client/exception/EmptyStringException.kt
@@ -1,4 +1,4 @@
-package com.algolia.search.exception
+package com.algolia.client.exception
 
 /**
  * This exception is thrown when an illegal empty [String] is encountered.

diff --git a/...nt-kotlin/client/src/commonMain/kotlin/com.algolia.client/exception/internal/Throwable.kt b/...nt-kotlin/client/src/commonMain/kotlin/com.algolia.client/exception/internal/Throwable.kt
@@ -0,0 +1,24 @@
+package com.algolia.client.exception.internal
+
+import com.algolia.client.exception.AlgoliaApiException
+import com.algolia.client.exception.AlgoliaClientException
+import com.algolia.client.exception.AlgoliaRuntimeException
+import io.ktor.client.plugins.ResponseException
+
+/**
+ * Coerce a Throwable to a [AlgoliaClientException].
+ */
+internal fun Throwable.asClientException(): com.algolia.client.exception.AlgoliaClientException {
+    return com.algolia.client.exception.AlgoliaClientException(message = message, cause = this)
+}
+
+/**
+ * Coerce a [ResponseException] to a [AlgoliaRuntimeException].
+ */
+internal fun ResponseException.asApiException(): com.algolia.client.exception.AlgoliaApiException {
+    return com.algolia.client.exception.AlgoliaApiException(
+        message = message,
+        cause = this,
+        httpErrorCode = response.status.value
+    )
+}
diff --git a/...in/com/algolia/search/logging/LogLevel.kt → ...in/com.algolia.client/logging/LogLevel.kt b/...in/com/algolia/search/logging/LogLevel.kt → ...in/com.algolia.client/logging/LogLevel.kt
@@ -1,4 +1,4 @@
-package com.algolia.search.logging
+package com.algolia.client.logging
 
 /**
  * Http client logging log level.

diff --git a/...tlin/com/algolia/search/logging/Logger.kt → ...tlin/com.algolia.client/logging/Logger.kt b/...tlin/com/algolia/search/logging/Logger.kt → ...tlin/com.algolia.client/logging/Logger.kt
@@ -1,6 +1,6 @@
-package com.algolia.search.logging
+package com.algolia.client.logging
 
-import com.algolia.search.logging.internal.MessageLengthLimitingLogger
+import com.algolia.client.logging.internal.MessageLengthLimitingLogger
 
 /**
  * Client Logger.

diff --git a/...g/internal/MessageLengthLimitingLogger.kt → ...g/internal/MessageLengthLimitingLogger.kt b/...g/internal/MessageLengthLimitingLogger.kt → ...g/internal/MessageLengthLimitingLogger.kt
@@ -1,6 +1,6 @@
-package com.algolia.search.logging.internal
+package com.algolia.client.logging.internal
 
-import com.algolia.search.logging.Logger
+import com.algolia.client.logging.Logger
 
 /**
  * A [Logger] that breaks up log messages into multiple logs no longer than [maxLength].

diff --git a/...kotlin/com/algolia/search/model/APIKey.kt → ...kotlin/com.algolia.client/model/APIKey.kt b/...kotlin/com/algolia/search/model/APIKey.kt → ...kotlin/com.algolia.client/model/APIKey.kt
@@ -1,6 +1,6 @@
-package com.algolia.search.model
+package com.algolia.client.model
 
-import com.algolia.search.exception.EmptyStringException
+import com.algolia.client.exception.EmptyStringException
 import kotlinx.serialization.Serializable
 import kotlin.jvm.JvmInline
 

diff --git a/...com/algolia/search/model/ApplicationID.kt → ...com.algolia.client/model/ApplicationID.kt b/...com/algolia/search/model/ApplicationID.kt → ...com.algolia.client/model/ApplicationID.kt
@@ -1,6 +1,6 @@
-package com.algolia.search.model
+package com.algolia.client.model
 
-import com.algolia.search.exception.EmptyStringException
+import com.algolia.client.exception.EmptyStringException
 import kotlin.jvm.JvmInline
 
 /**

diff --git a/...lient-kotlin/client/src/commonMain/kotlin/com.algolia.client/transport/CustomRequester.kt b/...lient-kotlin/client/src/commonMain/kotlin/com.algolia.client/transport/CustomRequester.kt
@@ -0,0 +1,55 @@
+package com.algolia.client.transport
+
+import com.algolia.client.configuration.CallType
+import io.ktor.http.*
+import io.ktor.util.reflect.*
+
+public interface CustomRequester {
+
+  /**
+   * Perform a custom request.
+   *
+   * @param method represents an HTTP method
+   * @param callType indicate whether the HTTP call performed is of type Read (GET) or Write (POST, PUT..)
+   * @param path request path
+   * @param requestOptions configure request locally
+   * @param body request body
+   * @param responseType return value type
+   *
+   * @return request's response; type [T] must be serializable
+   */
+  public suspend fun <T> customRequest(
+    method: HttpMethod,
+    callType: CallType,
+    path: String,
+    responseType: TypeInfo,
+    body: String? = null,
+    requestOptions: RequestOptions? = null,
+  ): T
+}
+
+/**
+ * Perform a custom request.
+ *
+ * @param method represents an HTTP method
+ * @param callType indicate whether the HTTP call performed is of type Read (GET) or Write (POST, PUT..)
+ * @param path request path
+ * @param requestOptions configure request locally
+ * @param body request body
+ *
+ * @return request's response; type [T] must be serializable
+ */
+public suspend inline fun <reified T> CustomRequester.customRequest(
+  method: HttpMethod,
+  callType: CallType,
+  path: String,
+  body: String? = null,
+  requestOptions: RequestOptions? = null,
+): T = customRequest(
+  method = method,
+  callType = callType,
+  path = path,
+  requestOptions = requestOptions,
+  body = body,
+  responseType = typeInfo<T>()
+)
diff --git a/...lgolia/search/transport/RequestOptions.kt → ...lgolia.client/transport/RequestOptions.kt b/...lgolia/search/transport/RequestOptions.kt → ...lgolia.client/transport/RequestOptions.kt
@@ -1,4 +1,4 @@
-package com.algolia.search.transport
+package com.algolia.client.transport
 
 import kotlinx.serialization.json.JsonObject
 

diff --git a/...-client-kotlin/client/src/commonMain/kotlin/com.algolia.client/transport/internal/Host.kt b/...-client-kotlin/client/src/commonMain/kotlin/com.algolia.client/transport/internal/Host.kt
@@ -0,0 +1,15 @@
+package com.algolia.client.transport.internal
+
+import com.algolia.client.configuration.CallType
+import com.algolia.client.configuration.Host
+import com.algolia.client.model.ApplicationID
+
+internal val ApplicationID.searchHosts
+  get() = listOf(
+      Host("$this-dsn.algolia.net", CallType.Read),
+      Host("$this.algolia.net", CallType.Write),
+  ) + mutableListOf(
+      Host("$this-1.algolianet.com"),
+      Host("$this-2.algolianet.com"),
+      Host("$this-3.algolianet.com")
+  ).apply { shuffle() }
diff --git a/.../transport/internal/HttpRequestBuilder.kt → .../transport/internal/HttpRequestBuilder.kt b/.../transport/internal/HttpRequestBuilder.kt → .../transport/internal/HttpRequestBuilder.kt
@@ -1,8 +1,8 @@
-package com.algolia.search.transport.internal
+package com.algolia.client.transport.internal
 
-import com.algolia.search.model.APIKey
-import com.algolia.search.model.ApplicationID
-import com.algolia.search.transport.RequestOptions
+import com.algolia.client.model.APIKey
+import com.algolia.client.model.ApplicationID
+import com.algolia.client.transport.RequestOptions
 import io.ktor.client.request.HttpRequestBuilder
 import io.ktor.client.request.header
 import io.ktor.client.request.parameter

diff --git a/...earch/transport/internal/RetryableHost.kt → ...lient/transport/internal/RetryableHost.kt b/...earch/transport/internal/RetryableHost.kt → ...lient/transport/internal/RetryableHost.kt
@@ -1,9 +1,9 @@
-package com.algolia.search.transport.internal
+package com.algolia.client.transport.internal
 
-import com.algolia.search.configuration.Host
+import com.algolia.client.configuration.Host
 
 internal data class RetryableHost(
-  private val host: Host,
+    private val host: Host,
 ) {
 
   val url get() = host.url

diff --git a/...algolia/search/transport/internal/Time.kt → ...algolia.client/transport/internal/Time.kt b/...algolia/search/transport/internal/Time.kt → ...algolia.client/transport/internal/Time.kt
@@ -1,4 +1,4 @@
-package com.algolia.search.transport.internal
+package com.algolia.client.transport.internal
 
 import kotlinx.datetime.Clock
 

diff --git a/...ia/search/transport/internal/Transport.kt → ...ia.client/transport/internal/Transport.kt b/...ia/search/transport/internal/Transport.kt → ...ia.client/transport/internal/Transport.kt
@@ -1,13 +1,13 @@
-package com.algolia.search.transport.internal
+package com.algolia.client.transport.internal
 
-import com.algolia.search.configuration.CallType
-import com.algolia.search.configuration.Configuration
-import com.algolia.search.configuration.Credentials
-import com.algolia.search.exception.UnreachableHostsException
-import com.algolia.search.exception.internal.asApiException
-import com.algolia.search.exception.internal.asClientException
-import com.algolia.search.transport.CustomRequester
-import com.algolia.search.transport.RequestOptions
+import com.algolia.client.configuration.CallType
+import com.algolia.client.configuration.Configuration
+import com.algolia.client.configuration.Credentials
+import com.algolia.client.exception.UnreachableHostsException
+import com.algolia.client.exception.internal.asApiException
+import com.algolia.client.exception.internal.asClientException
+import com.algolia.client.transport.CustomRequester
+import com.algolia.client.transport.RequestOptions
 import io.ktor.client.call.HttpClientCall
 import io.ktor.client.call.body
 import io.ktor.client.network.sockets.ConnectTimeoutException
@@ -30,8 +30,8 @@ import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 
 internal class Transport(
-  private val configuration: Configuration,
-  private val credentialsOrNull: Credentials?,
+    private val configuration: Configuration,
+    private val credentialsOrNull: Credentials?,
 ) : CustomRequester {
 
   private val hostStatusExpirationDelayMS: Long = 1000L * 60L * 5L
@@ -50,11 +50,11 @@ internal class Transport(
    * @param body request body
    */
   suspend inline fun <reified T> request(
-    httpMethod: HttpMethod,
-    callType: CallType,
-    path: String,
-    requestOptions: RequestOptions?,
-    body: String? = null,
+      httpMethod: HttpMethod,
+      callType: CallType,
+      path: String,
+      requestOptions: RequestOptions?,
+      body: String? = null,
   ): T {
     return execute(httpMethod, callType, path, requestOptions, body) {
       val response = configuration.httpClient.request(it)
@@ -66,12 +66,12 @@ internal class Transport(
    * Execute HTTP request (with retry strategy) and get a result as [T].
    */
   private suspend inline fun <T> execute(
-    httpMethod: HttpMethod,
-    callType: CallType,
-    path: String,
-    requestOptions: RequestOptions?,
-    body: String? = null,
-    block: (HttpRequestBuilder) -> T
+      httpMethod: HttpMethod,
+      callType: CallType,
+      path: String,
+      requestOptions: RequestOptions?,
+      body: String? = null,
+      block: (HttpRequestBuilder) -> T
   ): T {
     val hosts = callableHosts(callType)
     val errors by lazy(LazyThreadSafetyMode.NONE) { mutableListOf<Throwable>() }
@@ -148,10 +148,10 @@ internal class Transport(
    * Set socket read/write timeout.
    */
   private fun setTimeout(
-    requestBuilder: HttpRequestBuilder,
-    requestOptions: RequestOptions?,
-    callType: CallType,
-    host: RetryableHost,
+      requestBuilder: HttpRequestBuilder,
+      requestOptions: RequestOptions?,
+      callType: CallType,
+      host: RetryableHost,
   ) {
     requestBuilder.timeout {
       val timeout = when (callType) {
@@ -163,12 +163,12 @@ internal class Transport(
   }
 
   override suspend fun <T> customRequest(
-    method: HttpMethod,
-    callType: CallType,
-    path: String,
-    responseType: TypeInfo,
-    body: String?,
-    requestOptions: RequestOptions?
+      method: HttpMethod,
+      callType: CallType,
+      path: String,
+      responseType: TypeInfo,
+      body: String?,
+      requestOptions: RequestOptions?
   ): T {
     val httpResponse = request<HttpResponse>(method, callType, path, requestOptions, body)
     return httpResponse.call.bodyAs(responseType)