diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 6c9d27e..bd8e261 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,14 +1,14 @@ # syntax=docker/dockerfile:1 FROM debian:bookworm-slim -RUN apt-get update && apt-get install -y \ +RUN apt-get update && apt-get install -y --no-install-recommends \ libxkbcommon0 \ ca-certificates \ ca-certificates-java \ make \ curl \ git \ - openjdk-17-jdk \ + openjdk-17-jdk-headless \ unzip \ libc++1 \ vim \ diff --git a/.release-please-manifest.json b/.release-please-manifest.json index b56c3d0..e8285b7 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,3 +1,3 @@ { - ".": "0.1.0-alpha.4" + ".": "0.1.0-alpha.5" } \ No newline at end of file diff --git a/.stats.yml b/.stats.yml index 6a8c142..dd47305 100644 --- a/.stats.yml +++ b/.stats.yml @@ -1 +1 @@ -configured_endpoints: 13 +configured_endpoints: 14 diff --git a/CHANGELOG.md b/CHANGELOG.md index 05ba197..7d8aff0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,27 @@ # Changelog +## 0.1.0-alpha.5 (2024-11-11) + +Full Changelog: [v0.1.0-alpha.4...v0.1.0-alpha.5](https://github.com/openlayer-ai/openlayer-java/compare/v0.1.0-alpha.4...v0.1.0-alpha.5) + +### Features + +* **api:** manual updates ([#42](https://github.com/openlayer-ai/openlayer-java/issues/42)) ([90b8621](https://github.com/openlayer-ai/openlayer-java/commit/90b8621b2a9cd61dac108272689fd0ac91892e98)) +* **api:** manual updates ([#43](https://github.com/openlayer-ai/openlayer-java/issues/43)) ([197d1e4](https://github.com/openlayer-ai/openlayer-java/commit/197d1e408bb880f11dde24d4af04b0b6102a05cd)) +* **api:** update via SDK Studio ([#40](https://github.com/openlayer-ai/openlayer-java/issues/40)) ([d739c0c](https://github.com/openlayer-ai/openlayer-java/commit/d739c0cf10da747b6116db07064f4211e138fbca)) +* **api:** update via SDK Studio ([#41](https://github.com/openlayer-ai/openlayer-java/issues/41)) ([115a8bb](https://github.com/openlayer-ai/openlayer-java/commit/115a8bb76b4cc1deb9abccd7ff9341c9e7507db2)) + + +### Bug Fixes + +* update stream data example ([01a6acb](https://github.com/openlayer-ai/openlayer-java/commit/01a6acb859853b961556dcc7e51b91a40def3461)) + + +### Chores + +* custom code changes ([#44](https://github.com/openlayer-ai/openlayer-java/issues/44)) ([d1a94e9](https://github.com/openlayer-ai/openlayer-java/commit/d1a94e9d34778ca922ce580a0d887201881114ee)) +* rebuild project due to codegen change ([#45](https://github.com/openlayer-ai/openlayer-java/issues/45)) ([546951e](https://github.com/openlayer-ai/openlayer-java/commit/546951ef157f61e22168e8bc3caee9e437c27a53)) + ## 0.1.0-alpha.4 (2024-09-23) Full Changelog: [v0.1.0-alpha.3...v0.1.0-alpha.4](https://github.com/openlayer-ai/openlayer-java/compare/v0.1.0-alpha.3...v0.1.0-alpha.4) diff --git a/README.md b/README.md index e6302e0..69a94ea 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ -[![Maven Central](https://img.shields.io/maven-central/v/com.openlayer.api/openlayer-java)](https://central.sonatype.com/artifact/com.openlayer.api/openlayer-java/0.1.0-alpha.4) +[![Maven Central](https://img.shields.io/maven-central/v/com.openlayer.api/openlayer-java)](https://central.sonatype.com/artifact/com.openlayer.api/openlayer-java/0.1.0-alpha.5) @@ -27,7 +27,7 @@ The REST API documentation can be found on [openlayer.com](https://openlayer.co ```kotlin -implementation("com.openlayer.api:openlayer-java:0.1.0-alpha.4") +implementation("com.openlayer.api:openlayer-java:0.1.0-alpha.5") ``` #### Maven @@ -36,7 +36,7 @@ implementation("com.openlayer.api:openlayer-java:0.1.0-alpha.4") com.openlayer.api openlayer-java - 0.1.0-alpha.4 + 0.1.0-alpha.5 ``` @@ -77,7 +77,7 @@ import com.openlayer.api.models.InferencePipelineDataStreamResponse; import java.util.List; InferencePipelineDataStreamParams params = InferencePipelineDataStreamParams.builder() - .rows(List.of(InferencePipelineDataStreamParams.Row.builder().build())) + .inferencePipelineId("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") .config(InferencePipelineDataStreamParams.Config.ofLlmData(InferencePipelineDataStreamParams.Config.LlmData.builder() .outputColumnName("output") .costColumnName("cost") @@ -85,8 +85,9 @@ InferencePipelineDataStreamParams params = InferencePipelineDataStreamParams.bui .numOfTokenColumnName("tokens") .timestampColumnName("timestamp") .build())) + .row(List.of(InferencePipelineDataStreamParams.Row.builder().build())) .build(); -InferencePipelineDataStreamResponse inferencePipelineDataStreamResponse = client.inferencePipelines().data().stream(params); +InferencePipelineDataStreamResponse response = client.inferencePipelines().data().stream(params); ``` --- @@ -118,7 +119,7 @@ InferencePipelineDataStreamParams params = InferencePipelineDataStreamParams.bui When receiving a response, the Openlayer Java SDK will deserialize it into instances of the typed model classes. In rare cases, the API may return a response property that doesn't match the expected Java type. If you directly access the mistaken property, the SDK will throw an unchecked `OpenlayerInvalidDataException` at runtime. If you would prefer to check in advance that that response is completely well-typed, call `.validate()` on the returned model. ```java -InferencePipelineDataStreamResponse inferencePipelineDataStreamResponse = client.inferencePipelines().data().stream().validate(); +InferencePipelineDataStreamResponse response = client.inferencePipelines().data().stream().validate(); ``` ### Response properties as JSON @@ -148,7 +149,7 @@ if (field.isMissing()) { Sometimes, the server response may include additional properties that are not yet available in this library's types. You can access them using the model's `_additionalProperties` method: ```java -JsonValue secret = inferencePipelineDataStreamResponse._additionalProperties().get("secret_field"); +JsonValue secret = projectCreateResponse._additionalProperties().get("secret_field"); ``` --- diff --git a/build.gradle.kts b/build.gradle.kts index 7683e5f..02d2b80 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,7 +4,7 @@ plugins { allprojects { group = "com.openlayer.api" - version = "0.1.0-alpha.4" // x-release-please-version + version = "0.1.0-alpha.5" // x-release-please-version } diff --git a/buildSrc/src/main/kotlin/openlayer.java.gradle.kts b/buildSrc/src/main/kotlin/openlayer.java.gradle.kts index 53e6330..32a150e 100644 --- a/buildSrc/src/main/kotlin/openlayer.java.gradle.kts +++ b/buildSrc/src/main/kotlin/openlayer.java.gradle.kts @@ -19,6 +19,7 @@ configure { importOrder() removeUnusedImports() palantirJavaFormat() + toggleOffOn() } } diff --git a/buildSrc/src/main/kotlin/openlayer.kotlin.gradle.kts b/buildSrc/src/main/kotlin/openlayer.kotlin.gradle.kts index 5c12826..b0bd08a 100644 --- a/buildSrc/src/main/kotlin/openlayer.kotlin.gradle.kts +++ b/buildSrc/src/main/kotlin/openlayer.kotlin.gradle.kts @@ -16,6 +16,7 @@ kotlin { configure { kotlin { ktfmt().kotlinlangStyle() + toggleOffOn() } } diff --git a/openlayer-java-client-okhttp/build.gradle.kts b/openlayer-java-client-okhttp/build.gradle.kts index 2788dd9..a295ce5 100644 --- a/openlayer-java-client-okhttp/build.gradle.kts +++ b/openlayer-java-client-okhttp/build.gradle.kts @@ -6,7 +6,6 @@ plugins { dependencies { api(project(":openlayer-java-core")) - implementation("com.google.guava:guava:33.0.0-jre") implementation("com.squareup.okhttp3:okhttp:4.12.0") testImplementation(kotlin("test")) diff --git a/openlayer-java-client-okhttp/src/main/kotlin/com/openlayer/api/client/okhttp/OkHttpClient.kt b/openlayer-java-client-okhttp/src/main/kotlin/com/openlayer/api/client/okhttp/OkHttpClient.kt index 13779b0..f7db194 100644 --- a/openlayer-java-client-okhttp/src/main/kotlin/com/openlayer/api/client/okhttp/OkHttpClient.kt +++ b/openlayer-java-client-okhttp/src/main/kotlin/com/openlayer/api/client/okhttp/OkHttpClient.kt @@ -1,8 +1,7 @@ package com.openlayer.api.client.okhttp -import com.google.common.collect.ListMultimap -import com.google.common.collect.MultimapBuilder import com.openlayer.api.core.RequestOptions +import com.openlayer.api.core.http.Headers import com.openlayer.api.core.http.HttpClient import com.openlayer.api.core.http.HttpMethod import com.openlayer.api.core.http.HttpRequest @@ -16,7 +15,6 @@ import java.time.Duration import java.util.concurrent.CompletableFuture import okhttp3.Call import okhttp3.Callback -import okhttp3.Headers import okhttp3.HttpUrl import okhttp3.HttpUrl.Companion.toHttpUrl import okhttp3.MediaType @@ -66,7 +64,6 @@ private constructor(private val okHttpClient: okhttp3.OkHttpClient, private val request.body?.run { future.whenComplete { _, _ -> close() } } val call = getClient(requestOptions).newCall(request.toRequest()) - call.enqueue( object : Callback { override fun onResponse(call: Call, response: Response) { @@ -90,13 +87,15 @@ private constructor(private val okHttpClient: okhttp3.OkHttpClient, private val private fun HttpRequest.toRequest(): Request { var body: RequestBody? = body?.toRequestBody() - // OkHttpClient always requires a request body for PUT and POST methods + // OkHttpClient always requires a request body for PUT and POST methods. if (body == null && (method == HttpMethod.PUT || method == HttpMethod.POST)) { body = "".toRequestBody() } val builder = Request.Builder().url(toUrl()).method(method.name, body) - headers.forEach(builder::header) + headers.names().forEach { name -> + headers.values(name).forEach { builder.header(name, it) } + } return builder.build() } @@ -108,7 +107,9 @@ private constructor(private val okHttpClient: okhttp3.OkHttpClient, private val val builder = baseUrl.newBuilder() pathSegments.forEach(builder::addPathSegment) - queryParams.forEach(builder::addQueryParameter) + queryParams.keys().forEach { key -> + queryParams.values(key).forEach { builder.addQueryParameter(key, it) } + } return builder.toString() } @@ -118,21 +119,13 @@ private constructor(private val okHttpClient: okhttp3.OkHttpClient, private val val length = contentLength() return object : RequestBody() { - override fun contentType(): MediaType? { - return mediaType - } + override fun contentType(): MediaType? = mediaType - override fun contentLength(): Long { - return length - } + override fun contentLength(): Long = length - override fun isOneShot(): Boolean { - return !repeatable() - } + override fun isOneShot(): Boolean = !repeatable() - override fun writeTo(sink: BufferedSink) { - writeTo(sink.outputStream()) - } + override fun writeTo(sink: BufferedSink) = writeTo(sink.outputStream()) } } @@ -140,33 +133,20 @@ private constructor(private val okHttpClient: okhttp3.OkHttpClient, private val val headers = headers.toHeaders() return object : HttpResponse { - override fun statusCode(): Int { - return code - } + override fun statusCode(): Int = code - override fun headers(): ListMultimap { - return headers - } + override fun headers(): Headers = headers - override fun body(): InputStream { - return body!!.byteStream() - } + override fun body(): InputStream = body!!.byteStream() - override fun close() { - body!!.close() - } + override fun close() = body!!.close() } } - private fun Headers.toHeaders(): ListMultimap { - val headers = - MultimapBuilder.treeKeys(String.CASE_INSENSITIVE_ORDER) - .arrayListValues() - .build() - - forEach { pair -> headers.put(pair.first, pair.second) } - - return headers + private fun okhttp3.Headers.toHeaders(): Headers { + val headersBuilder = Headers.builder() + forEach { (name, value) -> headersBuilder.put(name, value) } + return headersBuilder.build() } companion object { @@ -176,7 +156,7 @@ private constructor(private val okHttpClient: okhttp3.OkHttpClient, private val class Builder { private var baseUrl: HttpUrl? = null - // default timeout is 1 minute + // The default timeout is 1 minute. private var timeout: Duration = Duration.ofSeconds(60) private var proxy: Proxy? = null @@ -186,8 +166,8 @@ private constructor(private val okHttpClient: okhttp3.OkHttpClient, private val fun proxy(proxy: Proxy?) = apply { this.proxy = proxy } - fun build(): OkHttpClient { - return OkHttpClient( + fun build(): OkHttpClient = + OkHttpClient( okhttp3.OkHttpClient.Builder() .connectTimeout(timeout) .readTimeout(timeout) @@ -197,6 +177,5 @@ private constructor(private val okHttpClient: okhttp3.OkHttpClient, private val .build(), checkNotNull(baseUrl) { "`baseUrl` is required but was not set" }, ) - } } } diff --git a/openlayer-java-client-okhttp/src/main/kotlin/com/openlayer/api/client/okhttp/OpenlayerOkHttpClient.kt b/openlayer-java-client-okhttp/src/main/kotlin/com/openlayer/api/client/okhttp/OpenlayerOkHttpClient.kt index 1dff803..6369d21 100644 --- a/openlayer-java-client-okhttp/src/main/kotlin/com/openlayer/api/client/okhttp/OpenlayerOkHttpClient.kt +++ b/openlayer-java-client-okhttp/src/main/kotlin/com/openlayer/api/client/okhttp/OpenlayerOkHttpClient.kt @@ -6,6 +6,8 @@ import com.fasterxml.jackson.databind.json.JsonMapper import com.openlayer.api.client.OpenlayerClient import com.openlayer.api.client.OpenlayerClientImpl import com.openlayer.api.core.ClientOptions +import com.openlayer.api.core.http.Headers +import com.openlayer.api.core.http.QueryParams import java.net.Proxy import java.time.Clock import java.time.Duration @@ -23,7 +25,7 @@ class OpenlayerOkHttpClient private constructor() { private var clientOptions: ClientOptions.Builder = ClientOptions.builder() private var baseUrl: String = ClientOptions.PRODUCTION_URL - // default timeout for client is 1 minute + // The default timeout for the client is 1 minute. private var timeout: Duration = Duration.ofSeconds(60) private var proxy: Proxy? = null @@ -36,6 +38,8 @@ class OpenlayerOkHttpClient private constructor() { fun clock(clock: Clock) = apply { clientOptions.clock(clock) } + fun headers(headers: Headers) = apply { clientOptions.headers(headers) } + fun headers(headers: Map>) = apply { clientOptions.headers(headers) } @@ -46,11 +50,73 @@ class OpenlayerOkHttpClient private constructor() { clientOptions.putHeaders(name, values) } + fun putAllHeaders(headers: Headers) = apply { clientOptions.putAllHeaders(headers) } + fun putAllHeaders(headers: Map>) = apply { clientOptions.putAllHeaders(headers) } - fun removeHeader(name: String) = apply { clientOptions.removeHeader(name) } + fun replaceHeaders(name: String, value: String) = apply { + clientOptions.replaceHeaders(name, value) + } + + fun replaceHeaders(name: String, values: Iterable) = apply { + clientOptions.replaceHeaders(name, values) + } + + fun replaceAllHeaders(headers: Headers) = apply { clientOptions.replaceAllHeaders(headers) } + + fun replaceAllHeaders(headers: Map>) = apply { + clientOptions.replaceAllHeaders(headers) + } + + fun removeHeaders(name: String) = apply { clientOptions.removeHeaders(name) } + + fun removeAllHeaders(names: Set) = apply { clientOptions.removeAllHeaders(names) } + + fun queryParams(queryParams: QueryParams) = apply { clientOptions.queryParams(queryParams) } + + fun queryParams(queryParams: Map>) = apply { + clientOptions.queryParams(queryParams) + } + + fun putQueryParam(key: String, value: String) = apply { + clientOptions.putQueryParam(key, value) + } + + fun putQueryParams(key: String, values: Iterable) = apply { + clientOptions.putQueryParams(key, values) + } + + fun putAllQueryParams(queryParams: QueryParams) = apply { + clientOptions.putAllQueryParams(queryParams) + } + + fun putAllQueryParams(queryParams: Map>) = apply { + clientOptions.putAllQueryParams(queryParams) + } + + fun replaceQueryParams(key: String, value: String) = apply { + clientOptions.replaceQueryParams(key, value) + } + + fun replaceQueryParams(key: String, values: Iterable) = apply { + clientOptions.replaceQueryParams(key, values) + } + + fun replaceAllQueryParams(queryParams: QueryParams) = apply { + clientOptions.replaceAllQueryParams(queryParams) + } + + fun replaceAllQueryParams(queryParams: Map>) = apply { + clientOptions.replaceAllQueryParams(queryParams) + } + + fun removeQueryParams(key: String) = apply { clientOptions.removeQueryParams(key) } + + fun removeAllQueryParams(keys: Set) = apply { + clientOptions.removeAllQueryParams(keys) + } fun timeout(timeout: Duration) = apply { this.timeout = timeout } @@ -66,8 +132,8 @@ class OpenlayerOkHttpClient private constructor() { fun fromEnv() = apply { clientOptions.fromEnv() } - fun build(): OpenlayerClient { - return OpenlayerClientImpl( + fun build(): OpenlayerClient = + OpenlayerClientImpl( clientOptions .httpClient( OkHttpClient.builder() @@ -78,6 +144,5 @@ class OpenlayerOkHttpClient private constructor() { ) .build() ) - } } } diff --git a/openlayer-java-client-okhttp/src/main/kotlin/com/openlayer/api/client/okhttp/OpenlayerOkHttpClientAsync.kt b/openlayer-java-client-okhttp/src/main/kotlin/com/openlayer/api/client/okhttp/OpenlayerOkHttpClientAsync.kt index 0866f95..3bd8ace 100644 --- a/openlayer-java-client-okhttp/src/main/kotlin/com/openlayer/api/client/okhttp/OpenlayerOkHttpClientAsync.kt +++ b/openlayer-java-client-okhttp/src/main/kotlin/com/openlayer/api/client/okhttp/OpenlayerOkHttpClientAsync.kt @@ -6,6 +6,8 @@ import com.fasterxml.jackson.databind.json.JsonMapper import com.openlayer.api.client.OpenlayerClientAsync import com.openlayer.api.client.OpenlayerClientAsyncImpl import com.openlayer.api.core.ClientOptions +import com.openlayer.api.core.http.Headers +import com.openlayer.api.core.http.QueryParams import java.net.Proxy import java.time.Clock import java.time.Duration @@ -23,7 +25,7 @@ class OpenlayerOkHttpClientAsync private constructor() { private var clientOptions: ClientOptions.Builder = ClientOptions.builder() private var baseUrl: String = ClientOptions.PRODUCTION_URL - // default timeout for client is 1 minute + // The default timeout for the client is 1 minute. private var timeout: Duration = Duration.ofSeconds(60) private var proxy: Proxy? = null @@ -36,6 +38,8 @@ class OpenlayerOkHttpClientAsync private constructor() { fun clock(clock: Clock) = apply { clientOptions.clock(clock) } + fun headers(headers: Headers) = apply { clientOptions.headers(headers) } + fun headers(headers: Map>) = apply { clientOptions.headers(headers) } @@ -46,11 +50,73 @@ class OpenlayerOkHttpClientAsync private constructor() { clientOptions.putHeaders(name, values) } + fun putAllHeaders(headers: Headers) = apply { clientOptions.putAllHeaders(headers) } + fun putAllHeaders(headers: Map>) = apply { clientOptions.putAllHeaders(headers) } - fun removeHeader(name: String) = apply { clientOptions.removeHeader(name) } + fun replaceHeaders(name: String, value: String) = apply { + clientOptions.replaceHeaders(name, value) + } + + fun replaceHeaders(name: String, values: Iterable) = apply { + clientOptions.replaceHeaders(name, values) + } + + fun replaceAllHeaders(headers: Headers) = apply { clientOptions.replaceAllHeaders(headers) } + + fun replaceAllHeaders(headers: Map>) = apply { + clientOptions.replaceAllHeaders(headers) + } + + fun removeHeaders(name: String) = apply { clientOptions.removeHeaders(name) } + + fun removeAllHeaders(names: Set) = apply { clientOptions.removeAllHeaders(names) } + + fun queryParams(queryParams: QueryParams) = apply { clientOptions.queryParams(queryParams) } + + fun queryParams(queryParams: Map>) = apply { + clientOptions.queryParams(queryParams) + } + + fun putQueryParam(key: String, value: String) = apply { + clientOptions.putQueryParam(key, value) + } + + fun putQueryParams(key: String, values: Iterable) = apply { + clientOptions.putQueryParams(key, values) + } + + fun putAllQueryParams(queryParams: QueryParams) = apply { + clientOptions.putAllQueryParams(queryParams) + } + + fun putAllQueryParams(queryParams: Map>) = apply { + clientOptions.putAllQueryParams(queryParams) + } + + fun replaceQueryParams(key: String, value: String) = apply { + clientOptions.replaceQueryParams(key, value) + } + + fun replaceQueryParams(key: String, values: Iterable) = apply { + clientOptions.replaceQueryParams(key, values) + } + + fun replaceAllQueryParams(queryParams: QueryParams) = apply { + clientOptions.replaceAllQueryParams(queryParams) + } + + fun replaceAllQueryParams(queryParams: Map>) = apply { + clientOptions.replaceAllQueryParams(queryParams) + } + + fun removeQueryParams(key: String) = apply { clientOptions.removeQueryParams(key) } + + fun removeAllQueryParams(keys: Set) = apply { + clientOptions.removeAllQueryParams(keys) + } fun timeout(timeout: Duration) = apply { this.timeout = timeout } @@ -66,8 +132,8 @@ class OpenlayerOkHttpClientAsync private constructor() { fun fromEnv() = apply { clientOptions.fromEnv() } - fun build(): OpenlayerClientAsync { - return OpenlayerClientAsyncImpl( + fun build(): OpenlayerClientAsync = + OpenlayerClientAsyncImpl( clientOptions .httpClient( OkHttpClient.builder() @@ -78,6 +144,5 @@ class OpenlayerOkHttpClientAsync private constructor() { ) .build() ) - } } } diff --git a/openlayer-java-core/build.gradle.kts b/openlayer-java-core/build.gradle.kts index 20066b7..1c5b4ba 100644 --- a/openlayer-java-core/build.gradle.kts +++ b/openlayer-java-core/build.gradle.kts @@ -6,7 +6,6 @@ plugins { dependencies { api("com.fasterxml.jackson.core:jackson-core:2.14.3") api("com.fasterxml.jackson.core:jackson-databind:2.14.3") - api("com.google.guava:guava:33.0.0-jre") implementation("com.fasterxml.jackson.core:jackson-annotations:2.14.3") implementation("com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.14.3") diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/client/OpenlayerClient.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/client/OpenlayerClient.kt index 3a24286..f9c3b57 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/client/OpenlayerClient.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/client/OpenlayerClient.kt @@ -1,7 +1,5 @@ // File generated from our OpenAPI spec by Stainless. -@file:Suppress("OVERLOADS_INTERFACE") // See https://youtrack.jetbrains.com/issue/KT-36102 - package com.openlayer.api.client import com.openlayer.api.models.* diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/client/OpenlayerClientAsync.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/client/OpenlayerClientAsync.kt index 7d8847c..620db2d 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/client/OpenlayerClientAsync.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/client/OpenlayerClientAsync.kt @@ -1,7 +1,5 @@ // File generated from our OpenAPI spec by Stainless. -@file:Suppress("OVERLOADS_INTERFACE") // See https://youtrack.jetbrains.com/issue/KT-36102 - package com.openlayer.api.client import com.openlayer.api.models.* diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/client/OpenlayerClientAsyncImpl.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/client/OpenlayerClientAsyncImpl.kt index d3c13ec..869906f 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/client/OpenlayerClientAsyncImpl.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/client/OpenlayerClientAsyncImpl.kt @@ -3,30 +3,41 @@ package com.openlayer.api.client import com.openlayer.api.core.ClientOptions -import com.openlayer.api.core.http.HttpResponse.Handler -import com.openlayer.api.errors.OpenlayerError +import com.openlayer.api.core.getPackageVersion import com.openlayer.api.models.* import com.openlayer.api.services.async.* -import com.openlayer.api.services.errorHandler class OpenlayerClientAsyncImpl constructor( private val clientOptions: ClientOptions, ) : OpenlayerClientAsync { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val clientOptionsWithUserAgent = + if (clientOptions.headers.names().contains("User-Agent")) clientOptions + else + clientOptions + .toBuilder() + .putHeader("User-Agent", "${javaClass.simpleName}/Java ${getPackageVersion()}") + .build() + // Pass the original clientOptions so that this client sets its own User-Agent. private val sync: OpenlayerClient by lazy { OpenlayerClientImpl(clientOptions) } - private val projects: ProjectServiceAsync by lazy { ProjectServiceAsyncImpl(clientOptions) } + private val projects: ProjectServiceAsync by lazy { + ProjectServiceAsyncImpl(clientOptionsWithUserAgent) + } - private val commits: CommitServiceAsync by lazy { CommitServiceAsyncImpl(clientOptions) } + private val commits: CommitServiceAsync by lazy { + CommitServiceAsyncImpl(clientOptionsWithUserAgent) + } private val inferencePipelines: InferencePipelineServiceAsync by lazy { - InferencePipelineServiceAsyncImpl(clientOptions) + InferencePipelineServiceAsyncImpl(clientOptionsWithUserAgent) } - private val storage: StorageServiceAsync by lazy { StorageServiceAsyncImpl(clientOptions) } + private val storage: StorageServiceAsync by lazy { + StorageServiceAsyncImpl(clientOptionsWithUserAgent) + } override fun sync(): OpenlayerClient = sync diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/client/OpenlayerClientImpl.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/client/OpenlayerClientImpl.kt index 29a6187..47335ac 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/client/OpenlayerClientImpl.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/client/OpenlayerClientImpl.kt @@ -3,30 +3,35 @@ package com.openlayer.api.client import com.openlayer.api.core.ClientOptions -import com.openlayer.api.core.http.HttpResponse.Handler -import com.openlayer.api.errors.OpenlayerError +import com.openlayer.api.core.getPackageVersion import com.openlayer.api.models.* import com.openlayer.api.services.blocking.* -import com.openlayer.api.services.errorHandler class OpenlayerClientImpl constructor( private val clientOptions: ClientOptions, ) : OpenlayerClient { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val clientOptionsWithUserAgent = + if (clientOptions.headers.names().contains("User-Agent")) clientOptions + else + clientOptions + .toBuilder() + .putHeader("User-Agent", "${javaClass.simpleName}/Java ${getPackageVersion()}") + .build() + // Pass the original clientOptions so that this client sets its own User-Agent. private val async: OpenlayerClientAsync by lazy { OpenlayerClientAsyncImpl(clientOptions) } - private val projects: ProjectService by lazy { ProjectServiceImpl(clientOptions) } + private val projects: ProjectService by lazy { ProjectServiceImpl(clientOptionsWithUserAgent) } - private val commits: CommitService by lazy { CommitServiceImpl(clientOptions) } + private val commits: CommitService by lazy { CommitServiceImpl(clientOptionsWithUserAgent) } private val inferencePipelines: InferencePipelineService by lazy { - InferencePipelineServiceImpl(clientOptions) + InferencePipelineServiceImpl(clientOptionsWithUserAgent) } - private val storage: StorageService by lazy { StorageServiceImpl(clientOptions) } + private val storage: StorageService by lazy { StorageServiceImpl(clientOptionsWithUserAgent) } override fun async(): OpenlayerClientAsync = async diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/core/ClientOptions.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/core/ClientOptions.kt index ed353b4..9dbd51c 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/core/ClientOptions.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/core/ClientOptions.kt @@ -3,24 +3,29 @@ package com.openlayer.api.core import com.fasterxml.jackson.databind.json.JsonMapper -import com.google.common.collect.ArrayListMultimap -import com.google.common.collect.ListMultimap +import com.openlayer.api.core.http.Headers import com.openlayer.api.core.http.HttpClient +import com.openlayer.api.core.http.PhantomReachableClosingHttpClient +import com.openlayer.api.core.http.QueryParams import com.openlayer.api.core.http.RetryingHttpClient import java.time.Clock class ClientOptions private constructor( + private val originalHttpClient: HttpClient, @get:JvmName("httpClient") val httpClient: HttpClient, @get:JvmName("jsonMapper") val jsonMapper: JsonMapper, @get:JvmName("clock") val clock: Clock, @get:JvmName("baseUrl") val baseUrl: String, - @get:JvmName("apiKey") val apiKey: String?, - @get:JvmName("headers") val headers: ListMultimap, - @get:JvmName("queryParams") val queryParams: ListMultimap, + @get:JvmName("headers") val headers: Headers, + @get:JvmName("queryParams") val queryParams: QueryParams, @get:JvmName("responseValidation") val responseValidation: Boolean, + @get:JvmName("maxRetries") val maxRetries: Int, + @get:JvmName("apiKey") val apiKey: String?, ) { + fun toBuilder() = Builder().from(this) + companion object { const val PRODUCTION_URL = "https://api.openlayer.com/v1" @@ -33,60 +38,115 @@ private constructor( class Builder { private var httpClient: HttpClient? = null - private var jsonMapper: JsonMapper? = null + private var jsonMapper: JsonMapper = jsonMapper() private var clock: Clock = Clock.systemUTC() private var baseUrl: String = PRODUCTION_URL - private var headers: MutableMap> = mutableMapOf() - private var queryParams: MutableMap> = mutableMapOf() + private var headers: Headers.Builder = Headers.builder() + private var queryParams: QueryParams.Builder = QueryParams.builder() private var responseValidation: Boolean = false private var maxRetries: Int = 2 private var apiKey: String? = null + @JvmSynthetic + internal fun from(clientOptions: ClientOptions) = apply { + httpClient = clientOptions.originalHttpClient + jsonMapper = clientOptions.jsonMapper + clock = clientOptions.clock + baseUrl = clientOptions.baseUrl + headers = clientOptions.headers.toBuilder() + queryParams = clientOptions.queryParams.toBuilder() + responseValidation = clientOptions.responseValidation + maxRetries = clientOptions.maxRetries + apiKey = clientOptions.apiKey + } + fun httpClient(httpClient: HttpClient) = apply { this.httpClient = httpClient } fun jsonMapper(jsonMapper: JsonMapper) = apply { this.jsonMapper = jsonMapper } + fun clock(clock: Clock) = apply { this.clock = clock } + fun baseUrl(baseUrl: String) = apply { this.baseUrl = baseUrl } - fun clock(clock: Clock) = apply { this.clock = clock } + fun headers(headers: Headers) = apply { + this.headers.clear() + putAllHeaders(headers) + } fun headers(headers: Map>) = apply { this.headers.clear() putAllHeaders(headers) } - fun putHeader(name: String, value: String) = apply { - this.headers.getOrPut(name) { mutableListOf() }.add(value) + fun putHeader(name: String, value: String) = apply { headers.put(name, value) } + + fun putHeaders(name: String, values: Iterable) = apply { headers.put(name, values) } + + fun putAllHeaders(headers: Headers) = apply { this.headers.putAll(headers) } + + fun putAllHeaders(headers: Map>) = apply { + this.headers.putAll(headers) } - fun putHeaders(name: String, values: Iterable) = apply { - this.headers.getOrPut(name) { mutableListOf() }.addAll(values) + fun replaceHeaders(name: String, value: String) = apply { headers.replace(name, value) } + + fun replaceHeaders(name: String, values: Iterable) = apply { + headers.replace(name, values) } - fun putAllHeaders(headers: Map>) = apply { - headers.forEach(this::putHeaders) + fun replaceAllHeaders(headers: Headers) = apply { this.headers.replaceAll(headers) } + + fun replaceAllHeaders(headers: Map>) = apply { + this.headers.replaceAll(headers) } - fun removeHeader(name: String) = apply { this.headers.put(name, mutableListOf()) } + fun removeHeaders(name: String) = apply { headers.remove(name) } + + fun removeAllHeaders(names: Set) = apply { headers.removeAll(names) } + + fun queryParams(queryParams: QueryParams) = apply { + this.queryParams.clear() + putAllQueryParams(queryParams) + } fun queryParams(queryParams: Map>) = apply { this.queryParams.clear() putAllQueryParams(queryParams) } - fun putQueryParam(name: String, value: String) = apply { - this.queryParams.getOrPut(name) { mutableListOf() }.add(value) + fun putQueryParam(key: String, value: String) = apply { queryParams.put(key, value) } + + fun putQueryParams(key: String, values: Iterable) = apply { + queryParams.put(key, values) } - fun putQueryParams(name: String, values: Iterable) = apply { - this.queryParams.getOrPut(name) { mutableListOf() }.addAll(values) + fun putAllQueryParams(queryParams: QueryParams) = apply { + this.queryParams.putAll(queryParams) } fun putAllQueryParams(queryParams: Map>) = apply { - queryParams.forEach(this::putQueryParams) + this.queryParams.putAll(queryParams) + } + + fun replaceQueryParams(key: String, value: String) = apply { + queryParams.replace(key, value) } - fun removeQueryParam(name: String) = apply { this.queryParams.put(name, mutableListOf()) } + fun replaceQueryParams(key: String, values: Iterable) = apply { + queryParams.replace(key, values) + } + + fun replaceAllQueryParams(queryParams: QueryParams) = apply { + this.queryParams.replaceAll(queryParams) + } + + fun replaceAllQueryParams(queryParams: Map>) = apply { + this.queryParams.replaceAll(queryParams) + } + + fun removeQueryParams(key: String) = apply { queryParams.remove(key) } + + fun removeAllQueryParams(keys: Set) = apply { queryParams.removeAll(keys) } fun responseValidation(responseValidation: Boolean) = apply { this.responseValidation = responseValidation @@ -101,33 +161,40 @@ private constructor( fun build(): ClientOptions { checkNotNull(httpClient) { "`httpClient` is required but was not set" } - val headers = ArrayListMultimap.create() - val queryParams = ArrayListMultimap.create() + val headers = Headers.builder() + val queryParams = QueryParams.builder() headers.put("X-Stainless-Lang", "java") headers.put("X-Stainless-Arch", getOsArch()) headers.put("X-Stainless-OS", getOsName()) headers.put("X-Stainless-OS-Version", getOsVersion()) headers.put("X-Stainless-Package-Version", getPackageVersion()) + headers.put("X-Stainless-Runtime", "JRE") headers.put("X-Stainless-Runtime-Version", getJavaVersion()) - if (!apiKey.isNullOrEmpty()) { - headers.put("Authorization", "Bearer ${apiKey}") + apiKey?.let { + if (!it.isEmpty()) { + headers.put("Authorization", "Bearer $it") + } } - this.headers.forEach(headers::replaceValues) - this.queryParams.forEach(queryParams::replaceValues) + headers.replaceAll(this.headers.build()) + queryParams.replaceAll(this.queryParams.build()) return ClientOptions( - RetryingHttpClient.builder() - .httpClient(httpClient!!) - .clock(clock) - .maxRetries(maxRetries) - .build(), - jsonMapper ?: jsonMapper(), + httpClient!!, + PhantomReachableClosingHttpClient( + RetryingHttpClient.builder() + .httpClient(httpClient!!) + .clock(clock) + .maxRetries(maxRetries) + .build() + ), + jsonMapper, clock, baseUrl, - apiKey, - headers.toUnmodifiable(), - queryParams.toUnmodifiable(), + headers.build(), + queryParams.build(), responseValidation, + maxRetries, + apiKey, ) } } diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/HttpRequestBodies.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/core/HttpRequestBodies.kt similarity index 96% rename from openlayer-java-core/src/main/kotlin/com/openlayer/api/services/HttpRequestBodies.kt rename to openlayer-java-core/src/main/kotlin/com/openlayer/api/core/HttpRequestBodies.kt index 3e8a1c1..8838f20 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/HttpRequestBodies.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/core/HttpRequestBodies.kt @@ -1,11 +1,8 @@ @file:JvmName("HttpRequestBodies") -package com.openlayer.api.services +package com.openlayer.api.core import com.fasterxml.jackson.databind.json.JsonMapper -import com.openlayer.api.core.Enum -import com.openlayer.api.core.JsonValue -import com.openlayer.api.core.MultipartFormValue import com.openlayer.api.core.http.HttpRequestBody import com.openlayer.api.errors.OpenlayerException import java.io.ByteArrayOutputStream diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/core/PhantomReachable.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/core/PhantomReachable.kt new file mode 100644 index 0000000..ad26316 --- /dev/null +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/core/PhantomReachable.kt @@ -0,0 +1,46 @@ +@file:JvmName("PhantomReachable") + +package com.openlayer.api.core + +import com.openlayer.api.errors.OpenlayerException +import java.lang.reflect.InvocationTargetException + +/** + * Closes [closeable] when [observed] becomes only phantom reachable. + * + * This is a wrapper around a Java 9+ [java.lang.ref.Cleaner], or a no-op in older Java versions. + */ +@JvmSynthetic +internal fun closeWhenPhantomReachable(observed: Any, closeable: AutoCloseable) { + check(observed !== closeable) { + "`observed` cannot be the same object as `closeable` because it would never become phantom reachable" + } + closeWhenPhantomReachable?.let { it(observed, closeable::close) } +} + +private val closeWhenPhantomReachable: ((Any, AutoCloseable) -> Unit)? by lazy { + try { + val cleanerClass = Class.forName("java.lang.ref.Cleaner") + val cleanerCreate = cleanerClass.getMethod("create") + val cleanerRegister = + cleanerClass.getMethod("register", Any::class.java, Runnable::class.java) + val cleanerObject = cleanerCreate.invoke(null); + + { observed, closeable -> + try { + cleanerRegister.invoke(cleanerObject, observed, Runnable { closeable.close() }) + } catch (e: ReflectiveOperationException) { + if (e is InvocationTargetException) { + when (val cause = e.cause) { + is RuntimeException, + is Error -> throw cause + } + } + throw OpenlayerException("Unexpected reflective invocation failure", e) + } + } + } catch (e: ReflectiveOperationException) { + // We're running Java 8, which has no Cleaner. + null + } +} diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/core/Properties.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/core/Properties.kt index bc0d02a..552568d 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/core/Properties.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/core/Properties.kt @@ -34,14 +34,9 @@ fun getOsName(): String { } } -fun getOsVersion(): String { - return System.getProperty("os.version", "unknown") -} +fun getOsVersion(): String = System.getProperty("os.version", "unknown") -fun getPackageVersion(): String { - return Properties::class.java.`package`.implementationVersion ?: "unknown" -} +fun getPackageVersion(): String = + Properties::class.java.`package`.implementationVersion ?: "unknown" -fun getJavaVersion(): String { - return System.getProperty("java.version", "unknown") -} +fun getJavaVersion(): String = System.getProperty("java.version", "unknown") diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/core/Utils.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/core/Utils.kt index 8f46e25..7c5ab9d 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/core/Utils.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/core/Utils.kt @@ -2,60 +2,25 @@ package com.openlayer.api.core -import com.google.common.collect.ImmutableListMultimap -import com.google.common.collect.ListMultimap -import com.google.common.collect.Multimaps import com.openlayer.api.errors.OpenlayerInvalidDataException import java.util.Collections +import java.util.SortedMap @JvmSynthetic -internal fun T?.getOrThrow(name: String): T { - if (this == null) { - throw OpenlayerInvalidDataException("'${name}' is not present") - } - - return this -} - -@JvmSynthetic -internal fun List.toUnmodifiable(): List { - if (isEmpty()) { - return Collections.emptyList() - } - - return Collections.unmodifiableList(this) -} +internal fun T?.getOrThrow(name: String): T = + this ?: throw OpenlayerInvalidDataException("`${name}` is not present") @JvmSynthetic -internal fun Map.toUnmodifiable(): Map { - if (isEmpty()) { - return Collections.emptyMap() - } - - return Collections.unmodifiableMap(this) -} +internal fun List.toImmutable(): List = + if (isEmpty()) Collections.emptyList() else Collections.unmodifiableList(toList()) @JvmSynthetic -internal fun ListMultimap.toUnmodifiable(): ListMultimap { - if (isEmpty()) { - return ImmutableListMultimap.of() - } - - return Multimaps.unmodifiableListMultimap(this) -} +internal fun Map.toImmutable(): Map = + if (isEmpty()) Collections.emptyMap() else Collections.unmodifiableMap(toMap()) @JvmSynthetic -internal fun ListMultimap.getRequiredHeader(header: String): String { - val value = - entries() - .stream() - .filter { entry -> entry.key.equals(header, ignoreCase = true) } - .map { entry -> entry.value } - .findFirst() - if (!value.isPresent) { - throw OpenlayerInvalidDataException("Could not find $header header") - } - return value.get() -} +internal fun , V> SortedMap.toImmutable(): SortedMap = + if (isEmpty()) Collections.emptySortedMap() + else Collections.unmodifiableSortedMap(toSortedMap(comparator())) internal interface Enum diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/core/Values.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/core/Values.kt index 12b454f..fc2653e 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/core/Values.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/core/Values.kt @@ -142,6 +142,8 @@ sealed class JsonField { // This filter should not be used directly and should instead use the @ExcludeMissing annotation class IsMissing { override fun equals(other: Any?): Boolean = other is JsonMissing + + override fun hashCode(): Int = Objects.hash() } class Deserializer(private val type: JavaType? = null) : @@ -387,7 +389,7 @@ private constructor( override fun toString() = values.toString() companion object { - @JsonCreator @JvmStatic fun of(values: List) = JsonArray(values.toUnmodifiable()) + @JsonCreator @JvmStatic fun of(values: List) = JsonArray(values.toImmutable()) } } @@ -413,7 +415,7 @@ private constructor( companion object { @JsonCreator @JvmStatic - fun of(values: Map) = JsonObject(values.toUnmodifiable()) + fun of(values: Map) = JsonObject(values.toImmutable()) } } @@ -479,9 +481,8 @@ internal constructor( } } - override fun toString(): String { - return "MultipartFormValue(name='$name', contentType=$contentType, filename=$filename, value=${valueToString()})" - } + override fun toString(): String = + "MultipartFormValue{name=$name, contentType=$contentType, filename=$filename, value=${valueToString()}}" private fun valueToString(): String = when (value) { diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/core/handlers/EmptyHandler.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/core/handlers/EmptyHandler.kt new file mode 100644 index 0000000..f59baa6 --- /dev/null +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/core/handlers/EmptyHandler.kt @@ -0,0 +1,12 @@ +@file:JvmName("EmptyHandler") + +package com.openlayer.api.core.handlers + +import com.openlayer.api.core.http.HttpResponse +import com.openlayer.api.core.http.HttpResponse.Handler + +@JvmSynthetic internal fun emptyHandler(): Handler = EmptyHandlerInternal + +private object EmptyHandlerInternal : Handler { + override fun handle(response: HttpResponse): Void? = null +} diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/core/handlers/ErrorHandler.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/core/handlers/ErrorHandler.kt new file mode 100644 index 0000000..5e44208 --- /dev/null +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/core/handlers/ErrorHandler.kt @@ -0,0 +1,125 @@ +@file:JvmName("ErrorHandler") + +package com.openlayer.api.core.handlers + +import com.fasterxml.jackson.databind.json.JsonMapper +import com.openlayer.api.core.http.Headers +import com.openlayer.api.core.http.HttpResponse +import com.openlayer.api.core.http.HttpResponse.Handler +import com.openlayer.api.errors.BadRequestException +import com.openlayer.api.errors.InternalServerException +import com.openlayer.api.errors.NotFoundException +import com.openlayer.api.errors.OpenlayerError +import com.openlayer.api.errors.PermissionDeniedException +import com.openlayer.api.errors.RateLimitException +import com.openlayer.api.errors.UnauthorizedException +import com.openlayer.api.errors.UnexpectedStatusCodeException +import com.openlayer.api.errors.UnprocessableEntityException +import java.io.ByteArrayInputStream +import java.io.InputStream + +@JvmSynthetic +internal fun errorHandler(jsonMapper: JsonMapper): Handler { + val handler = jsonHandler(jsonMapper) + + return object : Handler { + override fun handle(response: HttpResponse): OpenlayerError = + try { + handler.handle(response) + } catch (e: Exception) { + OpenlayerError.builder().build() + } + } +} + +@JvmSynthetic +internal fun Handler.withErrorHandler(errorHandler: Handler): Handler = + object : Handler { + override fun handle(response: HttpResponse): T { + when (val statusCode = response.statusCode()) { + in 200..299 -> { + return this@withErrorHandler.handle(response) + } + 400 -> { + val buffered = response.buffered() + throw BadRequestException( + buffered.headers(), + stringHandler().handle(buffered), + errorHandler.handle(buffered), + ) + } + 401 -> { + val buffered = response.buffered() + throw UnauthorizedException( + buffered.headers(), + stringHandler().handle(buffered), + errorHandler.handle(buffered), + ) + } + 403 -> { + val buffered = response.buffered() + throw PermissionDeniedException( + buffered.headers(), + stringHandler().handle(buffered), + errorHandler.handle(buffered), + ) + } + 404 -> { + val buffered = response.buffered() + throw NotFoundException( + buffered.headers(), + stringHandler().handle(buffered), + errorHandler.handle(buffered), + ) + } + 422 -> { + val buffered = response.buffered() + throw UnprocessableEntityException( + buffered.headers(), + stringHandler().handle(buffered), + errorHandler.handle(buffered), + ) + } + 429 -> { + val buffered = response.buffered() + throw RateLimitException( + buffered.headers(), + stringHandler().handle(buffered), + errorHandler.handle(buffered), + ) + } + in 500..599 -> { + val buffered = response.buffered() + throw InternalServerException( + statusCode, + buffered.headers(), + stringHandler().handle(buffered), + errorHandler.handle(buffered), + ) + } + else -> { + val buffered = response.buffered() + throw UnexpectedStatusCodeException( + statusCode, + buffered.headers(), + stringHandler().handle(buffered), + errorHandler.handle(buffered), + ) + } + } + } + } + +private fun HttpResponse.buffered(): HttpResponse { + val body = body().readBytes() + + return object : HttpResponse { + override fun statusCode(): Int = this@buffered.statusCode() + + override fun headers(): Headers = this@buffered.headers() + + override fun body(): InputStream = ByteArrayInputStream(body) + + override fun close() = this@buffered.close() + } +} diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/core/handlers/JsonHandler.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/core/handlers/JsonHandler.kt new file mode 100644 index 0000000..6babe3b --- /dev/null +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/core/handlers/JsonHandler.kt @@ -0,0 +1,21 @@ +@file:JvmName("JsonHandler") + +package com.openlayer.api.core.handlers + +import com.fasterxml.jackson.databind.json.JsonMapper +import com.fasterxml.jackson.module.kotlin.jacksonTypeRef +import com.openlayer.api.core.http.HttpResponse +import com.openlayer.api.core.http.HttpResponse.Handler +import com.openlayer.api.errors.OpenlayerException + +@JvmSynthetic +internal inline fun jsonHandler(jsonMapper: JsonMapper): Handler = + object : Handler { + override fun handle(response: HttpResponse): T { + try { + return jsonMapper.readValue(response.body(), jacksonTypeRef()) + } catch (e: Exception) { + throw OpenlayerException("Error reading response", e) + } + } + } diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/core/handlers/StringHandler.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/core/handlers/StringHandler.kt new file mode 100644 index 0000000..d0f697d --- /dev/null +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/core/handlers/StringHandler.kt @@ -0,0 +1,13 @@ +@file:JvmName("StringHandler") + +package com.openlayer.api.core.handlers + +import com.openlayer.api.core.http.HttpResponse +import com.openlayer.api.core.http.HttpResponse.Handler + +@JvmSynthetic internal fun stringHandler(): Handler = StringHandlerInternal + +private object StringHandlerInternal : Handler { + override fun handle(response: HttpResponse): String = + response.body().readBytes().toString(Charsets.UTF_8) +} diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/core/http/BinaryResponseContent.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/core/http/BinaryResponseContent.kt deleted file mode 100644 index 79dd3d8..0000000 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/core/http/BinaryResponseContent.kt +++ /dev/null @@ -1,16 +0,0 @@ -package com.openlayer.api.core.http - -import java.io.IOException -import java.io.InputStream -import java.io.OutputStream -import java.lang.AutoCloseable -import java.util.Optional - -interface BinaryResponseContent : AutoCloseable { - - fun contentType(): Optional - - fun body(): InputStream - - @Throws(IOException::class) fun writeTo(outputStream: OutputStream) -} diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/core/http/Headers.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/core/http/Headers.kt new file mode 100644 index 0000000..8b934c1 --- /dev/null +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/core/http/Headers.kt @@ -0,0 +1,92 @@ +package com.openlayer.api.core.http + +import com.openlayer.api.core.toImmutable +import java.util.TreeMap + +class Headers +private constructor( + private val map: Map>, + @get:JvmName("size") val size: Int +) { + + fun isEmpty(): Boolean = map.isEmpty() + + fun names(): Set = map.keys + + fun values(name: String): List = map[name].orEmpty() + + fun toBuilder(): Builder = Builder().putAll(map) + + companion object { + + @JvmStatic fun builder() = Builder() + } + + class Builder { + + private val map: MutableMap> = + TreeMap(String.CASE_INSENSITIVE_ORDER) + private var size: Int = 0 + + fun put(name: String, value: String) = apply { + map.getOrPut(name) { mutableListOf() }.add(value) + size++ + } + + fun put(name: String, values: Iterable) = apply { values.forEach { put(name, it) } } + + fun putAll(headers: Map>) = apply { headers.forEach(::put) } + + fun putAll(headers: Headers) = apply { + headers.names().forEach { put(it, headers.values(it)) } + } + + fun remove(name: String) = apply { size -= map.remove(name).orEmpty().size } + + fun removeAll(names: Set) = apply { names.forEach(::remove) } + + fun clear() = apply { + map.clear() + size = 0 + } + + fun replace(name: String, value: String) = apply { + remove(name) + put(name, value) + } + + fun replace(name: String, values: Iterable) = apply { + remove(name) + put(name, values) + } + + fun replaceAll(headers: Map>) = apply { + headers.forEach(::replace) + } + + fun replaceAll(headers: Headers) = apply { + headers.names().forEach { replace(it, headers.values(it)) } + } + + fun build() = + Headers( + map.mapValuesTo(TreeMap(String.CASE_INSENSITIVE_ORDER)) { (_, values) -> + values.toImmutable() + } + .toImmutable(), + size + ) + } + + override fun hashCode(): Int = map.hashCode() + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return other is Headers && map == other.map + } + + override fun toString(): String = "Headers{map=$map}" +} diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/core/http/HttpClient.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/core/http/HttpClient.kt index e6fb4bc..bed23ad 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/core/http/HttpClient.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/core/http/HttpClient.kt @@ -1,3 +1,5 @@ +@file:Suppress("OVERLOADS_INTERFACE") // See https://youtrack.jetbrains.com/issue/KT-36102 + package com.openlayer.api.core.http import com.openlayer.api.core.RequestOptions @@ -6,11 +8,13 @@ import java.util.concurrent.CompletableFuture interface HttpClient : AutoCloseable { + @JvmOverloads fun execute( request: HttpRequest, requestOptions: RequestOptions = RequestOptions.none(), ): HttpResponse + @JvmOverloads fun executeAsync( request: HttpRequest, requestOptions: RequestOptions = RequestOptions.none(), diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/core/http/HttpRequest.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/core/http/HttpRequest.kt index 243c19a..1acfcbc 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/core/http/HttpRequest.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/core/http/HttpRequest.kt @@ -1,23 +1,21 @@ package com.openlayer.api.core.http -import com.google.common.collect.ArrayListMultimap -import com.google.common.collect.ListMultimap -import com.google.common.collect.Multimap -import com.google.common.collect.MultimapBuilder -import com.openlayer.api.core.toUnmodifiable +import com.openlayer.api.core.toImmutable class HttpRequest private constructor( @get:JvmName("method") val method: HttpMethod, @get:JvmName("url") val url: String?, @get:JvmName("pathSegments") val pathSegments: List, - @get:JvmName("queryParams") val queryParams: ListMultimap, - @get:JvmName("headers") val headers: ListMultimap, + @get:JvmName("headers") val headers: Headers, + @get:JvmName("queryParams") val queryParams: QueryParams, @get:JvmName("body") val body: HttpRequestBody?, ) { + fun toBuilder(): Builder = Builder().from(this) + override fun toString(): String = - "HttpRequest {method=$method, pathSegments=$pathSegments, queryParams=$queryParams, headers=$headers, body=$body}" + "HttpRequest{method=$method, url=$url, pathSegments=$pathSegments, headers=$headers, queryParams=$queryParams, body=$body}" companion object { @JvmStatic fun builder() = Builder() @@ -27,65 +25,120 @@ private constructor( private var method: HttpMethod? = null private var url: String? = null - private var pathSegments: MutableList = ArrayList() - private var queryParams: ListMultimap = ArrayListMultimap.create() + private var pathSegments: MutableList = mutableListOf() + private var headers: Headers.Builder = Headers.builder() + private var queryParams: QueryParams.Builder = QueryParams.builder() private var body: HttpRequestBody? = null - private var headers: ListMultimap = - MultimapBuilder.treeKeys(String.CASE_INSENSITIVE_ORDER).arrayListValues().build() + + @JvmSynthetic + internal fun from(request: HttpRequest) = apply { + method = request.method + url = request.url + pathSegments = request.pathSegments.toMutableList() + headers = request.headers.toBuilder() + queryParams = request.queryParams.toBuilder() + body = request.body + } fun method(method: HttpMethod) = apply { this.method = method } fun url(url: String) = apply { this.url = url } - fun addPathSegment(pathSegment: String) = apply { this.pathSegments.add(pathSegment) } + fun addPathSegment(pathSegment: String) = apply { pathSegments.add(pathSegment) } fun addPathSegments(vararg pathSegments: String) = apply { - for (pathSegment in pathSegments) { - this.pathSegments.add(pathSegment) - } + this.pathSegments.addAll(pathSegments) } - fun putQueryParam(name: String, value: String) = apply { - this.queryParams.replaceValues(name, listOf(value)) + fun headers(headers: Headers) = apply { + this.headers.clear() + putAllHeaders(headers) } - fun putQueryParams(name: String, values: Iterable) = apply { - this.queryParams.replaceValues(name, values) + fun headers(headers: Map>) = apply { + this.headers.clear() + putAllHeaders(headers) } - fun putAllQueryParams(queryParams: Map>) = apply { - queryParams.forEach(this::putQueryParams) + fun putHeader(name: String, value: String) = apply { headers.put(name, value) } + + fun putHeaders(name: String, values: Iterable) = apply { headers.put(name, values) } + + fun putAllHeaders(headers: Headers) = apply { this.headers.putAll(headers) } + + fun putAllHeaders(headers: Map>) = apply { + this.headers.putAll(headers) } - fun putAllQueryParams(queryParams: Multimap) = apply { - queryParams.asMap().forEach(this::putQueryParams) + fun replaceHeaders(name: String, value: String) = apply { headers.replace(name, value) } + + fun replaceHeaders(name: String, values: Iterable) = apply { + headers.replace(name, values) } - fun putHeader(name: String, value: String) = apply { - this.headers.replaceValues(name, listOf(value)) + fun replaceAllHeaders(headers: Headers) = apply { this.headers.replaceAll(headers) } + + fun replaceAllHeaders(headers: Map>) = apply { + this.headers.replaceAll(headers) } - fun putHeaders(name: String, values: Iterable) = apply { - this.headers.replaceValues(name, values) + fun removeHeaders(name: String) = apply { headers.remove(name) } + + fun removeAllHeaders(names: Set) = apply { headers.removeAll(names) } + + fun queryParams(queryParams: QueryParams) = apply { + this.queryParams.clear() + putAllQueryParams(queryParams) } - fun putAllHeaders(headers: Map>) = apply { - headers.forEach(this::putHeaders) + fun queryParams(queryParams: Map>) = apply { + this.queryParams.clear() + putAllQueryParams(queryParams) } - fun putAllHeaders(headers: Multimap) = apply { - headers.asMap().forEach(this::putHeaders) + fun putQueryParam(key: String, value: String) = apply { queryParams.put(key, value) } + + fun putQueryParams(key: String, values: Iterable) = apply { + queryParams.put(key, values) } + fun putAllQueryParams(queryParams: QueryParams) = apply { + this.queryParams.putAll(queryParams) + } + + fun putAllQueryParams(queryParams: Map>) = apply { + this.queryParams.putAll(queryParams) + } + + fun replaceQueryParams(key: String, value: String) = apply { + queryParams.replace(key, value) + } + + fun replaceQueryParams(key: String, values: Iterable) = apply { + queryParams.replace(key, values) + } + + fun replaceAllQueryParams(queryParams: QueryParams) = apply { + this.queryParams.replaceAll(queryParams) + } + + fun replaceAllQueryParams(queryParams: Map>) = apply { + this.queryParams.replaceAll(queryParams) + } + + fun removeQueryParams(key: String) = apply { queryParams.remove(key) } + + fun removeAllQueryParams(keys: Set) = apply { queryParams.removeAll(keys) } + fun body(body: HttpRequestBody) = apply { this.body = body } fun build(): HttpRequest = HttpRequest( checkNotNull(method) { "`method` is required but was not set" }, url, - pathSegments.toUnmodifiable(), - queryParams.toUnmodifiable(), - headers, + pathSegments.toImmutable(), + headers.build(), + queryParams.build(), body, ) } diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/core/http/HttpResponse.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/core/http/HttpResponse.kt index 5c5f3ce..098bc98 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/core/http/HttpResponse.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/core/http/HttpResponse.kt @@ -1,6 +1,5 @@ package com.openlayer.api.core.http -import com.google.common.collect.ListMultimap import java.io.InputStream import java.lang.AutoCloseable @@ -8,7 +7,7 @@ interface HttpResponse : AutoCloseable { fun statusCode(): Int - fun headers(): ListMultimap + fun headers(): Headers fun body(): InputStream diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/core/http/PhantomReachableClosingHttpClient.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/core/http/PhantomReachableClosingHttpClient.kt new file mode 100644 index 0000000..ab4266e --- /dev/null +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/core/http/PhantomReachableClosingHttpClient.kt @@ -0,0 +1,21 @@ +package com.openlayer.api.core.http + +import com.openlayer.api.core.RequestOptions +import com.openlayer.api.core.closeWhenPhantomReachable +import java.util.concurrent.CompletableFuture + +internal class PhantomReachableClosingHttpClient(private val httpClient: HttpClient) : HttpClient { + init { + closeWhenPhantomReachable(this, httpClient) + } + + override fun execute(request: HttpRequest, requestOptions: RequestOptions): HttpResponse = + httpClient.execute(request, requestOptions) + + override fun executeAsync( + request: HttpRequest, + requestOptions: RequestOptions + ): CompletableFuture = httpClient.executeAsync(request, requestOptions) + + override fun close() = httpClient.close() +} diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/core/http/QueryParams.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/core/http/QueryParams.kt new file mode 100644 index 0000000..4a53fb0 --- /dev/null +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/core/http/QueryParams.kt @@ -0,0 +1,86 @@ +package com.openlayer.api.core.http + +import com.openlayer.api.core.toImmutable + +class QueryParams +private constructor( + private val map: Map>, + @get:JvmName("size") val size: Int +) { + + fun isEmpty(): Boolean = map.isEmpty() + + fun keys(): Set = map.keys + + fun values(key: String): List = map[key].orEmpty() + + fun toBuilder(): Builder = Builder().putAll(map) + + companion object { + + @JvmStatic fun builder() = Builder() + } + + class Builder { + + private val map: MutableMap> = mutableMapOf() + private var size: Int = 0 + + fun put(key: String, value: String) = apply { + map.getOrPut(key) { mutableListOf() }.add(value) + size++ + } + + fun put(key: String, values: Iterable) = apply { values.forEach { put(key, it) } } + + fun putAll(queryParams: Map>) = apply { + queryParams.forEach(::put) + } + + fun putAll(queryParams: QueryParams) = apply { + queryParams.keys().forEach { put(it, queryParams.values(it)) } + } + + fun replace(key: String, value: String) = apply { + remove(key) + put(key, value) + } + + fun replace(key: String, values: Iterable) = apply { + remove(key) + put(key, values) + } + + fun replaceAll(queryParams: Map>) = apply { + queryParams.forEach(::replace) + } + + fun replaceAll(queryParams: QueryParams) = apply { + queryParams.keys().forEach { replace(it, queryParams.values(it)) } + } + + fun remove(key: String) = apply { size -= map.remove(key).orEmpty().size } + + fun removeAll(keys: Set) = apply { keys.forEach(::remove) } + + fun clear() = apply { + map.clear() + size = 0 + } + + fun build() = + QueryParams(map.mapValues { (_, values) -> values.toImmutable() }.toImmutable(), size) + } + + override fun hashCode(): Int = map.hashCode() + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return other is QueryParams && map == other.map + } + + override fun toString(): String = "QueryParams{map=$map}" +} diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/core/http/RetryingHttpClient.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/core/http/RetryingHttpClient.kt index a90d6f4..56feff5 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/core/http/RetryingHttpClient.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/core/http/RetryingHttpClient.kt @@ -1,8 +1,5 @@ -@file:JvmSynthetic - package com.openlayer.api.core.http -import com.google.common.util.concurrent.MoreExecutors import com.openlayer.api.core.RequestOptions import com.openlayer.api.errors.OpenlayerIoException import java.io.IOException @@ -38,14 +35,22 @@ private constructor( return httpClient.execute(request, requestOptions) } - maybeAddIdempotencyHeader(request) + var modifiedRequest = maybeAddIdempotencyHeader(request) + + // Don't send the current retry count in the headers if the caller set their own value. + val shouldSendRetryCount = + !modifiedRequest.headers.names().contains("X-Stainless-Retry-Count") var retries = 0 while (true) { + if (shouldSendRetryCount) { + modifiedRequest = setRetryCountHeader(modifiedRequest, retries) + } + val response = try { - val response = httpClient.execute(request, requestOptions) + val response = httpClient.execute(modifiedRequest, requestOptions) if (++retries > maxRetries || !shouldRetry(response)) { return response } @@ -72,12 +77,23 @@ private constructor( return httpClient.executeAsync(request, requestOptions) } - maybeAddIdempotencyHeader(request) + val modifiedRequest = maybeAddIdempotencyHeader(request) + + // Don't send the current retry count in the headers if the caller set their own value. + val shouldSendRetryCount = + !modifiedRequest.headers.names().contains("X-Stainless-Retry-Count") var retries = 0 - fun wrap(future: CompletableFuture): CompletableFuture { - return future + fun executeWithRetries( + request: HttpRequest, + requestOptions: RequestOptions, + ): CompletableFuture { + val requestWithRetryCount = + if (shouldSendRetryCount) setRetryCountHeader(request, retries) else request + + return httpClient + .executeAsync(requestWithRetryCount, requestOptions) .handleAsync( fun( response: HttpResponse?, @@ -97,39 +113,46 @@ private constructor( val backoffMillis = getRetryBackoffMillis(retries, response) return sleepAsync(backoffMillis.toMillis()).thenCompose { - wrap(httpClient.executeAsync(request, requestOptions)) + executeWithRetries(requestWithRetryCount, requestOptions) } }, - MoreExecutors.directExecutor() - ) + ) { + // Run in the same thread. + it.run() + } .thenCompose(Function.identity()) } - return wrap(httpClient.executeAsync(request, requestOptions)) + return executeWithRetries(modifiedRequest, requestOptions) } - override fun close() { - httpClient.close() - } + override fun close() = httpClient.close() - private fun isRetryable(request: HttpRequest): Boolean { + private fun isRetryable(request: HttpRequest): Boolean = // Some requests, such as when a request body is being streamed, cannot be retried because // the body data aren't available on subsequent attempts. - return request.body?.repeatable() ?: true - } + request.body?.repeatable() ?: true + + private fun setRetryCountHeader(request: HttpRequest, retries: Int): HttpRequest = + request.toBuilder().replaceHeaders("X-Stainless-Retry-Count", retries.toString()).build() private fun idempotencyKey(): String = "stainless-java-retry-${UUID.randomUUID()}" - private fun maybeAddIdempotencyHeader(request: HttpRequest) { - if (idempotencyHeader != null && !request.headers.containsKey(idempotencyHeader)) { - // Set a header to uniquely identify the request when retried - request.headers.put(idempotencyHeader, idempotencyKey()) + private fun maybeAddIdempotencyHeader(request: HttpRequest): HttpRequest { + if (idempotencyHeader == null || request.headers.names().contains(idempotencyHeader)) { + return request } + + return request + .toBuilder() + // Set a header to uniquely identify the request when retried. + .putHeader(idempotencyHeader, idempotencyKey()) + .build() } private fun shouldRetry(response: HttpResponse): Boolean { // Note: this is not a standard header - val shouldRetryHeader = response.headers().get("x-should-retry").getOrNull(0) + val shouldRetryHeader = response.headers().values("X-Should-Retry").getOrNull(0) val statusCode = response.statusCode() return when { @@ -149,11 +172,10 @@ private constructor( } } - private fun shouldRetry(throwable: Throwable): Boolean { + private fun shouldRetry(throwable: Throwable): Boolean = // Only retry IOException and OpenlayerIoException, other exceptions are not intended to be // retried. - return throwable is IOException || throwable is OpenlayerIoException - } + throwable is IOException || throwable is OpenlayerIoException private fun getRetryBackoffMillis(retries: Int, response: HttpResponse?): Duration { // About the Retry-After header: @@ -162,11 +184,11 @@ private constructor( ?.headers() ?.let { headers -> headers - .get("Retry-After-Ms") + .values("Retry-After-Ms") .getOrNull(0) ?.toFloatOrNull() ?.times(TimeUnit.MILLISECONDS.toNanos(1)) - ?: headers.get("Retry-After").getOrNull(0)?.let { retryAfter -> + ?: headers.values("Retry-After").getOrNull(0)?.let { retryAfter -> retryAfter.toFloatOrNull()?.times(TimeUnit.SECONDS.toNanos(1)) ?: try { ChronoUnit.MILLIS.between( diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/errors/BadRequestException.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/errors/BadRequestException.kt index f51b5d2..cddebd0 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/errors/BadRequestException.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/errors/BadRequestException.kt @@ -1,13 +1,9 @@ package com.openlayer.api.errors -import com.google.common.collect.ListMultimap +import com.openlayer.api.core.http.Headers -class BadRequestException -constructor( - headers: ListMultimap, - private val error: OpenlayerError, -) : OpenlayerServiceException(headers, "${error}") { - override fun statusCode(): Int = 400 - - fun error(): OpenlayerError = error -} +class BadRequestException( + headers: Headers, + body: String, + error: OpenlayerError, +) : OpenlayerServiceException(400, headers, body, error) diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/errors/InternalServerException.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/errors/InternalServerException.kt index b0c6a67..ba8c911 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/errors/InternalServerException.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/errors/InternalServerException.kt @@ -1,14 +1,10 @@ package com.openlayer.api.errors -import com.google.common.collect.ListMultimap +import com.openlayer.api.core.http.Headers -class InternalServerException -constructor( - private val statusCode: Int, - headers: ListMultimap, - private val error: OpenlayerError, -) : OpenlayerServiceException(headers, "${error}") { - override fun statusCode(): Int = statusCode - - fun error(): OpenlayerError = error -} +class InternalServerException( + statusCode: Int, + headers: Headers, + body: String, + error: OpenlayerError, +) : OpenlayerServiceException(statusCode, headers, body, error) diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/errors/NotFoundException.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/errors/NotFoundException.kt index 9efe856..0786e63 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/errors/NotFoundException.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/errors/NotFoundException.kt @@ -1,13 +1,9 @@ package com.openlayer.api.errors -import com.google.common.collect.ListMultimap +import com.openlayer.api.core.http.Headers -class NotFoundException -constructor( - headers: ListMultimap, - private val error: OpenlayerError, -) : OpenlayerServiceException(headers, "${error}") { - override fun statusCode(): Int = 404 - - fun error(): OpenlayerError = error -} +class NotFoundException( + headers: Headers, + body: String, + error: OpenlayerError, +) : OpenlayerServiceException(404, headers, body, error) diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/errors/OpenlayerError.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/errors/OpenlayerError.kt index 59250fe..582b268 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/errors/OpenlayerError.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/errors/OpenlayerError.kt @@ -7,34 +7,34 @@ import com.fasterxml.jackson.annotation.JsonAnySetter import com.fasterxml.jackson.databind.annotation.JsonDeserialize import com.openlayer.api.core.JsonValue import com.openlayer.api.core.NoAutoDetect -import com.openlayer.api.core.toUnmodifiable +import com.openlayer.api.core.toImmutable import java.util.Objects @JsonDeserialize(builder = OpenlayerError.Builder::class) @NoAutoDetect class OpenlayerError -constructor( - private val additionalProperties: Map, +private constructor( + @JsonAnyGetter + @get:JvmName("additionalProperties") + val additionalProperties: Map, ) { - @JsonAnyGetter fun additionalProperties(): Map = additionalProperties - - fun toBuilder() = Builder() - override fun equals(other: Any?): Boolean { if (this === other) { return true } - return other is OpenlayerError && this.additionalProperties == other.additionalProperties + return /* spotless:off */ other is OpenlayerError && this.additionalProperties == other.additionalProperties /* spotless:on */ } override fun hashCode(): Int { - return Objects.hash(additionalProperties) + return /* spotless:off */ Objects.hash(additionalProperties) /* spotless:on */ } override fun toString() = "OpenlayerError{additionalProperties=$additionalProperties}" + fun toBuilder() = Builder().from(this) + companion object { @JvmStatic fun builder() = Builder() @@ -44,22 +44,31 @@ constructor( private var additionalProperties: MutableMap = mutableMapOf() - fun from(error: OpenlayerError) = apply { additionalProperties(error.additionalProperties) } + @JvmSynthetic + internal fun from(openlayerError: OpenlayerError) = apply { + additionalProperties = openlayerError.additionalProperties.toMutableMap() + } fun additionalProperties(additionalProperties: Map) = apply { this.additionalProperties.clear() - this.additionalProperties.putAll(additionalProperties) + putAllAdditionalProperties(additionalProperties) } @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { - this.additionalProperties.put(key, value) + additionalProperties.put(key, value) } fun putAllAdditionalProperties(additionalProperties: Map) = apply { this.additionalProperties.putAll(additionalProperties) } - fun build(): OpenlayerError = OpenlayerError(additionalProperties.toUnmodifiable()) + fun removeAdditionalProperty(key: String) = apply { additionalProperties.remove(key) } + + fun removeAllAdditionalProperties(keys: Set) = apply { + keys.forEach(::removeAdditionalProperty) + } + + fun build(): OpenlayerError = OpenlayerError(additionalProperties.toImmutable()) } } diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/errors/OpenlayerServiceException.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/errors/OpenlayerServiceException.kt index 916e4ed..586f9be 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/errors/OpenlayerServiceException.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/errors/OpenlayerServiceException.kt @@ -1,15 +1,23 @@ package com.openlayer.api.errors -import com.google.common.collect.ListMultimap +import com.openlayer.api.core.http.Headers abstract class OpenlayerServiceException @JvmOverloads constructor( - private val headers: ListMultimap, - message: String? = null, + private val statusCode: Int, + private val headers: Headers, + private val body: String, + private val error: OpenlayerError, + message: String = "$statusCode: $error", cause: Throwable? = null ) : OpenlayerException(message, cause) { - abstract fun statusCode(): Int - fun headers(): ListMultimap = headers + fun statusCode(): Int = statusCode + + fun headers(): Headers = headers + + fun body(): String = body + + fun error(): OpenlayerError = error } diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/errors/PermissionDeniedException.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/errors/PermissionDeniedException.kt index cc7f0d6..89f54d4 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/errors/PermissionDeniedException.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/errors/PermissionDeniedException.kt @@ -1,13 +1,9 @@ package com.openlayer.api.errors -import com.google.common.collect.ListMultimap +import com.openlayer.api.core.http.Headers -class PermissionDeniedException -constructor( - headers: ListMultimap, - private val error: OpenlayerError, -) : OpenlayerServiceException(headers, "${error}") { - override fun statusCode(): Int = 403 - - fun error(): OpenlayerError = error -} +class PermissionDeniedException( + headers: Headers, + body: String, + error: OpenlayerError, +) : OpenlayerServiceException(403, headers, body, error) diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/errors/RateLimitException.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/errors/RateLimitException.kt index 5b83fd0..27bfad4 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/errors/RateLimitException.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/errors/RateLimitException.kt @@ -1,13 +1,9 @@ package com.openlayer.api.errors -import com.google.common.collect.ListMultimap +import com.openlayer.api.core.http.Headers -class RateLimitException -constructor( - headers: ListMultimap, - private val error: OpenlayerError, -) : OpenlayerServiceException(headers, "${error}") { - override fun statusCode(): Int = 429 - - fun error(): OpenlayerError = error -} +class RateLimitException( + headers: Headers, + body: String, + error: OpenlayerError, +) : OpenlayerServiceException(429, headers, body, error) diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/errors/UnauthorizedException.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/errors/UnauthorizedException.kt index f0e8f0f..ba6f77e 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/errors/UnauthorizedException.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/errors/UnauthorizedException.kt @@ -1,13 +1,9 @@ package com.openlayer.api.errors -import com.google.common.collect.ListMultimap +import com.openlayer.api.core.http.Headers -class UnauthorizedException -constructor( - headers: ListMultimap, - private val error: OpenlayerError, -) : OpenlayerServiceException(headers, "${error}") { - override fun statusCode(): Int = 401 - - fun error(): OpenlayerError = error -} +class UnauthorizedException( + headers: Headers, + body: String, + error: OpenlayerError, +) : OpenlayerServiceException(401, headers, body, error) diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/errors/UnexpectedStatusCodeException.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/errors/UnexpectedStatusCodeException.kt index 30e8d3a..b4cab62 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/errors/UnexpectedStatusCodeException.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/errors/UnexpectedStatusCodeException.kt @@ -1,14 +1,10 @@ package com.openlayer.api.errors -import com.google.common.collect.ListMultimap +import com.openlayer.api.core.http.Headers -class UnexpectedStatusCodeException -constructor( - private val statusCode: Int, - headers: ListMultimap, - private val body: String -) : OpenlayerServiceException(headers, "Unexpected status code: ${statusCode}") { - override fun statusCode(): Int = statusCode - - fun body() = body -} +class UnexpectedStatusCodeException( + statusCode: Int, + headers: Headers, + body: String, + error: OpenlayerError, +) : OpenlayerServiceException(statusCode, headers, body, error) diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/errors/UnprocessableEntityException.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/errors/UnprocessableEntityException.kt index 87dba98..e7d2ecd 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/errors/UnprocessableEntityException.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/errors/UnprocessableEntityException.kt @@ -1,13 +1,9 @@ package com.openlayer.api.errors -import com.google.common.collect.ListMultimap +import com.openlayer.api.core.http.Headers -class UnprocessableEntityException -constructor( - headers: ListMultimap, - private val error: OpenlayerError, -) : OpenlayerServiceException(headers, "${error}") { - override fun statusCode(): Int = 422 - - fun error(): OpenlayerError = error -} +class UnprocessableEntityException( + headers: Headers, + body: String, + error: OpenlayerError, +) : OpenlayerServiceException(422, headers, body, error) diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/CommitTestResultListParams.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/CommitTestResultListParams.kt index 67f54ef..2f44b32 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/CommitTestResultListParams.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/CommitTestResultListParams.kt @@ -7,7 +7,8 @@ import com.openlayer.api.core.Enum import com.openlayer.api.core.JsonField import com.openlayer.api.core.JsonValue import com.openlayer.api.core.NoAutoDetect -import com.openlayer.api.core.toUnmodifiable +import com.openlayer.api.core.http.Headers +import com.openlayer.api.core.http.QueryParams import com.openlayer.api.errors.OpenlayerInvalidDataException import com.openlayer.api.models.* import java.util.Objects @@ -21,8 +22,8 @@ constructor( private val perPage: Long?, private val status: Status?, private val type: Type?, - private val additionalQueryParams: Map>, - private val additionalHeaders: Map>, + private val additionalHeaders: Headers, + private val additionalQueryParams: QueryParams, ) { fun projectVersionId(): String = projectVersionId @@ -37,20 +38,20 @@ constructor( fun type(): Optional = Optional.ofNullable(type) + @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + @JvmSynthetic - internal fun getQueryParams(): Map> { - val params = mutableMapOf>() - this.includeArchived?.let { params.put("includeArchived", listOf(it.toString())) } - this.page?.let { params.put("page", listOf(it.toString())) } - this.perPage?.let { params.put("perPage", listOf(it.toString())) } - this.status?.let { params.put("status", listOf(it.toString())) } - this.type?.let { params.put("type", listOf(it.toString())) } - params.putAll(additionalQueryParams) - return params.toUnmodifiable() + internal fun getQueryParams(): QueryParams { + val queryParams = QueryParams.builder() + this.includeArchived?.let { queryParams.put("includeArchived", listOf(it.toString())) } + this.page?.let { queryParams.put("page", listOf(it.toString())) } + this.perPage?.let { queryParams.put("perPage", listOf(it.toString())) } + this.status?.let { queryParams.put("status", listOf(it.toString())) } + this.type?.let { queryParams.put("type", listOf(it.toString())) } + queryParams.putAll(additionalQueryParams) + return queryParams.build() } - @JvmSynthetic internal fun getHeaders(): Map> = additionalHeaders - fun getPathParam(index: Int): String { return when (index) { 0 -> projectVersionId @@ -58,41 +59,24 @@ constructor( } } - fun _additionalQueryParams(): Map> = additionalQueryParams + fun _additionalHeaders(): Headers = additionalHeaders - fun _additionalHeaders(): Map> = additionalHeaders + fun _additionalQueryParams(): QueryParams = additionalQueryParams override fun equals(other: Any?): Boolean { if (this === other) { return true } - return other is CommitTestResultListParams && - this.projectVersionId == other.projectVersionId && - this.includeArchived == other.includeArchived && - this.page == other.page && - this.perPage == other.perPage && - this.status == other.status && - this.type == other.type && - this.additionalQueryParams == other.additionalQueryParams && - this.additionalHeaders == other.additionalHeaders + return /* spotless:off */ other is CommitTestResultListParams && this.projectVersionId == other.projectVersionId && this.includeArchived == other.includeArchived && this.page == other.page && this.perPage == other.perPage && this.status == other.status && this.type == other.type && this.additionalHeaders == other.additionalHeaders && this.additionalQueryParams == other.additionalQueryParams /* spotless:on */ } override fun hashCode(): Int { - return Objects.hash( - projectVersionId, - includeArchived, - page, - perPage, - status, - type, - additionalQueryParams, - additionalHeaders, - ) + return /* spotless:off */ Objects.hash(projectVersionId, includeArchived, page, perPage, status, type, additionalHeaders, additionalQueryParams) /* spotless:on */ } override fun toString() = - "CommitTestResultListParams{projectVersionId=$projectVersionId, includeArchived=$includeArchived, page=$page, perPage=$perPage, status=$status, type=$type, additionalQueryParams=$additionalQueryParams, additionalHeaders=$additionalHeaders}" + "CommitTestResultListParams{projectVersionId=$projectVersionId, includeArchived=$includeArchived, page=$page, perPage=$perPage, status=$status, type=$type, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams}" fun toBuilder() = Builder().from(this) @@ -110,8 +94,8 @@ constructor( private var perPage: Long? = null private var status: Status? = null private var type: Type? = null - private var additionalQueryParams: MutableMap> = mutableMapOf() - private var additionalHeaders: MutableMap> = mutableMapOf() + private var additionalHeaders: Headers.Builder = Headers.builder() + private var additionalQueryParams: QueryParams.Builder = QueryParams.builder() @JvmSynthetic internal fun from(commitTestResultListParams: CommitTestResultListParams) = apply { @@ -121,8 +105,8 @@ constructor( this.perPage = commitTestResultListParams.perPage this.status = commitTestResultListParams.status this.type = commitTestResultListParams.type - additionalQueryParams(commitTestResultListParams.additionalQueryParams) additionalHeaders(commitTestResultListParams.additionalHeaders) + additionalQueryParams(commitTestResultListParams.additionalQueryParams) } fun projectVersionId(projectVersionId: String) = apply { @@ -152,45 +136,103 @@ constructor( */ fun type(type: Type) = apply { this.type = type } - fun additionalQueryParams(additionalQueryParams: Map>) = apply { - this.additionalQueryParams.clear() - putAllQueryParams(additionalQueryParams) + fun additionalHeaders(additionalHeaders: Headers) = apply { + this.additionalHeaders.clear() + putAllAdditionalHeaders(additionalHeaders) } - fun putQueryParam(name: String, value: String) = apply { - this.additionalQueryParams.getOrPut(name) { mutableListOf() }.add(value) + fun additionalHeaders(additionalHeaders: Map>) = apply { + this.additionalHeaders.clear() + putAllAdditionalHeaders(additionalHeaders) } - fun putQueryParams(name: String, values: Iterable) = apply { - this.additionalQueryParams.getOrPut(name) { mutableListOf() }.addAll(values) + fun putAdditionalHeader(name: String, value: String) = apply { + additionalHeaders.put(name, value) } - fun putAllQueryParams(additionalQueryParams: Map>) = apply { - additionalQueryParams.forEach(this::putQueryParams) + fun putAdditionalHeaders(name: String, values: Iterable) = apply { + additionalHeaders.put(name, values) } - fun removeQueryParam(name: String) = apply { - this.additionalQueryParams.put(name, mutableListOf()) + fun putAllAdditionalHeaders(additionalHeaders: Headers) = apply { + this.additionalHeaders.putAll(additionalHeaders) } - fun additionalHeaders(additionalHeaders: Map>) = apply { - this.additionalHeaders.clear() - putAllHeaders(additionalHeaders) + fun putAllAdditionalHeaders(additionalHeaders: Map>) = apply { + this.additionalHeaders.putAll(additionalHeaders) } - fun putHeader(name: String, value: String) = apply { - this.additionalHeaders.getOrPut(name) { mutableListOf() }.add(value) + fun replaceAdditionalHeaders(name: String, value: String) = apply { + additionalHeaders.replace(name, value) } - fun putHeaders(name: String, values: Iterable) = apply { - this.additionalHeaders.getOrPut(name) { mutableListOf() }.addAll(values) + fun replaceAdditionalHeaders(name: String, values: Iterable) = apply { + additionalHeaders.replace(name, values) } - fun putAllHeaders(additionalHeaders: Map>) = apply { - additionalHeaders.forEach(this::putHeaders) + fun replaceAllAdditionalHeaders(additionalHeaders: Headers) = apply { + this.additionalHeaders.replaceAll(additionalHeaders) } - fun removeHeader(name: String) = apply { this.additionalHeaders.put(name, mutableListOf()) } + fun replaceAllAdditionalHeaders(additionalHeaders: Map>) = apply { + this.additionalHeaders.replaceAll(additionalHeaders) + } + + fun removeAdditionalHeaders(name: String) = apply { additionalHeaders.remove(name) } + + fun removeAllAdditionalHeaders(names: Set) = apply { + additionalHeaders.removeAll(names) + } + + fun additionalQueryParams(additionalQueryParams: QueryParams) = apply { + this.additionalQueryParams.clear() + putAllAdditionalQueryParams(additionalQueryParams) + } + + fun additionalQueryParams(additionalQueryParams: Map>) = apply { + this.additionalQueryParams.clear() + putAllAdditionalQueryParams(additionalQueryParams) + } + + fun putAdditionalQueryParam(key: String, value: String) = apply { + additionalQueryParams.put(key, value) + } + + fun putAdditionalQueryParams(key: String, values: Iterable) = apply { + additionalQueryParams.put(key, values) + } + + fun putAllAdditionalQueryParams(additionalQueryParams: QueryParams) = apply { + this.additionalQueryParams.putAll(additionalQueryParams) + } + + fun putAllAdditionalQueryParams(additionalQueryParams: Map>) = + apply { + this.additionalQueryParams.putAll(additionalQueryParams) + } + + fun replaceAdditionalQueryParams(key: String, value: String) = apply { + additionalQueryParams.replace(key, value) + } + + fun replaceAdditionalQueryParams(key: String, values: Iterable) = apply { + additionalQueryParams.replace(key, values) + } + + fun replaceAllAdditionalQueryParams(additionalQueryParams: QueryParams) = apply { + this.additionalQueryParams.replaceAll(additionalQueryParams) + } + + fun replaceAllAdditionalQueryParams(additionalQueryParams: Map>) = + apply { + this.additionalQueryParams.replaceAll(additionalQueryParams) + } + + fun removeAdditionalQueryParams(key: String) = apply { additionalQueryParams.remove(key) } + + fun removeAllAdditionalQueryParams(keys: Set) = apply { + additionalQueryParams.removeAll(keys) + } fun build(): CommitTestResultListParams = CommitTestResultListParams( @@ -200,8 +242,8 @@ constructor( perPage, status, type, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), + additionalHeaders.build(), + additionalQueryParams.build(), ) } @@ -218,7 +260,7 @@ constructor( return true } - return other is Status && this.value == other.value + return /* spotless:off */ other is Status && this.value == other.value /* spotless:on */ } override fun hashCode() = value.hashCode() @@ -293,7 +335,7 @@ constructor( return true } - return other is Type && this.value == other.value + return /* spotless:off */ other is Type && this.value == other.value /* spotless:on */ } override fun hashCode() = value.hashCode() diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/CommitTestResultListResponse.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/CommitTestResultListResponse.kt index 9c6554a..be9a40d 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/CommitTestResultListResponse.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/CommitTestResultListResponse.kt @@ -22,7 +22,7 @@ import com.openlayer.api.core.JsonMissing import com.openlayer.api.core.JsonValue import com.openlayer.api.core.NoAutoDetect import com.openlayer.api.core.getOrThrow -import com.openlayer.api.core.toUnmodifiable +import com.openlayer.api.core.toImmutable import com.openlayer.api.errors.OpenlayerInvalidDataException import java.time.OffsetDateTime import java.util.Objects @@ -38,8 +38,6 @@ private constructor( private var validated: Boolean = false - private var hashCode: Int = 0 - fun items(): List = items.getRequired("items") @JsonProperty("items") @ExcludeMissing fun _items() = items @@ -57,26 +55,6 @@ private constructor( fun toBuilder() = Builder().from(this) - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return other is CommitTestResultListResponse && - this.items == other.items && - this.additionalProperties == other.additionalProperties - } - - override fun hashCode(): Int { - if (hashCode == 0) { - hashCode = Objects.hash(items, additionalProperties) - } - return hashCode - } - - override fun toString() = - "CommitTestResultListResponse{items=$items, additionalProperties=$additionalProperties}" - companion object { @JvmStatic fun builder() = Builder() @@ -115,8 +93,8 @@ private constructor( fun build(): CommitTestResultListResponse = CommitTestResultListResponse( - items.map { it.toUnmodifiable() }, - additionalProperties.toUnmodifiable() + items.map { it.toImmutable() }, + additionalProperties.toImmutable() ) } @@ -140,8 +118,6 @@ private constructor( private var validated: Boolean = false - private var hashCode: Int = 0 - /** Project version (commit) id. */ fun id(): String = id.getRequired("id") @@ -236,50 +212,6 @@ private constructor( fun toBuilder() = Builder().from(this) - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return other is Item && - this.id == other.id && - this.goal == other.goal && - this.goalId == other.goalId && - this.projectVersionId == other.projectVersionId && - this.inferencePipelineId == other.inferencePipelineId && - this.dateCreated == other.dateCreated && - this.dateUpdated == other.dateUpdated && - this.dateDataStarts == other.dateDataStarts && - this.dateDataEnds == other.dateDataEnds && - this.status == other.status && - this.statusMessage == other.statusMessage && - this.additionalProperties == other.additionalProperties - } - - override fun hashCode(): Int { - if (hashCode == 0) { - hashCode = - Objects.hash( - id, - goal, - goalId, - projectVersionId, - inferencePipelineId, - dateCreated, - dateUpdated, - dateDataStarts, - dateDataEnds, - status, - statusMessage, - additionalProperties, - ) - } - return hashCode - } - - override fun toString() = - "Item{id=$id, goal=$goal, goalId=$goalId, projectVersionId=$projectVersionId, inferencePipelineId=$inferencePipelineId, dateCreated=$dateCreated, dateUpdated=$dateUpdated, dateDataStarts=$dateDataStarts, dateDataEnds=$dateDataEnds, status=$status, statusMessage=$statusMessage, additionalProperties=$additionalProperties}" - companion object { @JvmStatic fun builder() = Builder() @@ -447,7 +379,7 @@ private constructor( dateDataEnds, status, statusMessage, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -464,7 +396,7 @@ private constructor( return true } - return other is Status && this.value == other.value + return /* spotless:off */ other is Status && this.value == other.value /* spotless:on */ } override fun hashCode() = value.hashCode() @@ -557,8 +489,6 @@ private constructor( private var validated: Boolean = false - private var hashCode: Int = 0 - /** The test id. */ fun id(): String = id.getRequired("id") @@ -742,72 +672,6 @@ private constructor( fun toBuilder() = Builder().from(this) - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return other is Goal && - this.id == other.id && - this.number == other.number && - this.name == other.name && - this.dateCreated == other.dateCreated && - this.dateUpdated == other.dateUpdated && - this.description == other.description && - this.evaluationWindow == other.evaluationWindow && - this.delayWindow == other.delayWindow && - this.type == other.type && - this.subtype == other.subtype && - this.creatorId == other.creatorId && - this.originProjectVersionId == other.originProjectVersionId && - this.thresholds == other.thresholds && - this.archived == other.archived && - this.dateArchived == other.dateArchived && - this.suggested == other.suggested && - this.commentCount == other.commentCount && - this.usesMlModel == other.usesMlModel && - this.usesValidationDataset == other.usesValidationDataset && - this.usesTrainingDataset == other.usesTrainingDataset && - this.usesReferenceDataset == other.usesReferenceDataset && - this.usesProductionData == other.usesProductionData && - this.additionalProperties == other.additionalProperties - } - - override fun hashCode(): Int { - if (hashCode == 0) { - hashCode = - Objects.hash( - id, - number, - name, - dateCreated, - dateUpdated, - description, - evaluationWindow, - delayWindow, - type, - subtype, - creatorId, - originProjectVersionId, - thresholds, - archived, - dateArchived, - suggested, - commentCount, - usesMlModel, - usesValidationDataset, - usesTrainingDataset, - usesReferenceDataset, - usesProductionData, - additionalProperties, - ) - } - return hashCode - } - - override fun toString() = - "Goal{id=$id, number=$number, name=$name, dateCreated=$dateCreated, dateUpdated=$dateUpdated, description=$description, evaluationWindow=$evaluationWindow, delayWindow=$delayWindow, type=$type, subtype=$subtype, creatorId=$creatorId, originProjectVersionId=$originProjectVersionId, thresholds=$thresholds, archived=$archived, dateArchived=$dateArchived, suggested=$suggested, commentCount=$commentCount, usesMlModel=$usesMlModel, usesValidationDataset=$usesValidationDataset, usesTrainingDataset=$usesTrainingDataset, usesReferenceDataset=$usesReferenceDataset, usesProductionData=$usesProductionData, additionalProperties=$additionalProperties}" - companion object { @JvmStatic fun builder() = Builder() @@ -1105,7 +969,7 @@ private constructor( subtype, creatorId, originProjectVersionId, - thresholds.map { it.toUnmodifiable() }, + thresholds.map { it.toImmutable() }, archived, dateArchived, suggested, @@ -1115,7 +979,7 @@ private constructor( usesTrainingDataset, usesReferenceDataset, usesProductionData, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -1133,8 +997,6 @@ private constructor( private var validated: Boolean = false - private var hashCode: Int = 0 - /** The measurement to be evaluated. */ fun measurement(): Optional = Optional.ofNullable(measurement.getNullable("measurement")) @@ -1186,38 +1048,6 @@ private constructor( fun toBuilder() = Builder().from(this) - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return other is Threshold && - this.measurement == other.measurement && - this.insightName == other.insightName && - this.insightParameters == other.insightParameters && - this.operator == other.operator && - this.value == other.value && - this.additionalProperties == other.additionalProperties - } - - override fun hashCode(): Int { - if (hashCode == 0) { - hashCode = - Objects.hash( - measurement, - insightName, - insightParameters, - operator, - value, - additionalProperties, - ) - } - return hashCode - } - - override fun toString() = - "Threshold{measurement=$measurement, insightName=$insightName, insightParameters=$insightParameters, operator=$operator, value=$value, additionalProperties=$additionalProperties}" - companion object { @JvmStatic fun builder() = Builder() @@ -1306,10 +1136,10 @@ private constructor( Threshold( measurement, insightName, - insightParameters.map { it.toUnmodifiable() }, + insightParameters.map { it.toImmutable() }, operator, value, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -1317,8 +1147,8 @@ private constructor( @JsonSerialize(using = Value.Serializer::class) class Value private constructor( - private val double: Double? = null, - private val boolean: Boolean? = null, + private val number: Double? = null, + private val bool: Boolean? = null, private val string: String? = null, private val strings: List? = null, private val _json: JsonValue? = null, @@ -1326,25 +1156,25 @@ private constructor( private var validated: Boolean = false - fun double(): Optional = Optional.ofNullable(double) + fun number(): Optional = Optional.ofNullable(number) - fun boolean(): Optional = Optional.ofNullable(boolean) + fun bool(): Optional = Optional.ofNullable(bool) fun string(): Optional = Optional.ofNullable(string) fun strings(): Optional> = Optional.ofNullable(strings) - fun isDouble(): Boolean = double != null + fun isNumber(): Boolean = number != null - fun isBoolean(): Boolean = boolean != null + fun isBool(): Boolean = bool != null fun isString(): Boolean = string != null fun isStrings(): Boolean = strings != null - fun asDouble(): Double = double.getOrThrow("double") + fun asNumber(): Double = number.getOrThrow("number") - fun asBoolean(): Boolean = boolean.getOrThrow("boolean") + fun asBool(): Boolean = bool.getOrThrow("bool") fun asString(): String = string.getOrThrow("string") @@ -1354,8 +1184,8 @@ private constructor( fun accept(visitor: Visitor): T { return when { - double != null -> visitor.visitDouble(double) - boolean != null -> visitor.visitBoolean(boolean) + number != null -> visitor.visitNumber(number) + bool != null -> visitor.visitBool(bool) string != null -> visitor.visitString(string) strings != null -> visitor.visitStrings(strings) else -> visitor.unknown(_json) @@ -1365,10 +1195,7 @@ private constructor( fun validate(): Value = apply { if (!validated) { if ( - double == null && - boolean == null && - string == null && - strings == null + number == null && bool == null && string == null && strings == null ) { throw OpenlayerInvalidDataException("Unknown Value: $_json") } @@ -1381,26 +1208,17 @@ private constructor( return true } - return other is Value && - this.double == other.double && - this.boolean == other.boolean && - this.string == other.string && - this.strings == other.strings + return /* spotless:off */ other is Value && this.number == other.number && this.bool == other.bool && this.string == other.string && this.strings == other.strings /* spotless:on */ } override fun hashCode(): Int { - return Objects.hash( - double, - boolean, - string, - strings, - ) + return /* spotless:off */ Objects.hash(number, bool, string, strings) /* spotless:on */ } override fun toString(): String { return when { - double != null -> "Value{double=$double}" - boolean != null -> "Value{boolean=$boolean}" + number != null -> "Value{number=$number}" + bool != null -> "Value{bool=$bool}" string != null -> "Value{string=$string}" strings != null -> "Value{strings=$strings}" _json != null -> "Value{_unknown=$_json}" @@ -1410,9 +1228,9 @@ private constructor( companion object { - @JvmStatic fun ofDouble(double: Double) = Value(double = double) + @JvmStatic fun ofNumber(number: Double) = Value(number = number) - @JvmStatic fun ofBoolean(boolean: Boolean) = Value(boolean = boolean) + @JvmStatic fun ofBool(bool: Boolean) = Value(bool = bool) @JvmStatic fun ofString(string: String) = Value(string = string) @@ -1421,9 +1239,9 @@ private constructor( interface Visitor { - fun visitDouble(double: Double): T + fun visitNumber(number: Double): T - fun visitBoolean(boolean: Boolean): T + fun visitBool(bool: Boolean): T fun visitString(string: String): T @@ -1438,11 +1256,12 @@ private constructor( override fun ObjectCodec.deserialize(node: JsonNode): Value { val json = JsonValue.fromJsonNode(node) + tryDeserialize(node, jacksonTypeRef())?.let { - return Value(double = it, _json = json) + return Value(number = it, _json = json) } tryDeserialize(node, jacksonTypeRef())?.let { - return Value(boolean = it, _json = json) + return Value(bool = it, _json = json) } tryDeserialize(node, jacksonTypeRef())?.let { return Value(string = it, _json = json) @@ -1463,8 +1282,8 @@ private constructor( provider: SerializerProvider ) { when { - value.double != null -> generator.writeObject(value.double) - value.boolean != null -> generator.writeObject(value.boolean) + value.number != null -> generator.writeObject(value.number) + value.bool != null -> generator.writeObject(value.bool) value.string != null -> generator.writeObject(value.string) value.strings != null -> generator.writeObject(value.strings) value._json != null -> generator.writeObject(value._json) @@ -1473,7 +1292,87 @@ private constructor( } } } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is Threshold && this.measurement == other.measurement && this.insightName == other.insightName && this.insightParameters == other.insightParameters && this.operator == other.operator && this.value == other.value && this.additionalProperties == other.additionalProperties /* spotless:on */ + } + + private var hashCode: Int = 0 + + override fun hashCode(): Int { + if (hashCode == 0) { + hashCode = /* spotless:off */ Objects.hash(measurement, insightName, insightParameters, operator, value, additionalProperties) /* spotless:on */ + } + return hashCode + } + + override fun toString() = + "Threshold{measurement=$measurement, insightName=$insightName, insightParameters=$insightParameters, operator=$operator, value=$value, additionalProperties=$additionalProperties}" + } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is Goal && this.id == other.id && this.number == other.number && this.name == other.name && this.dateCreated == other.dateCreated && this.dateUpdated == other.dateUpdated && this.description == other.description && this.evaluationWindow == other.evaluationWindow && this.delayWindow == other.delayWindow && this.type == other.type && this.subtype == other.subtype && this.creatorId == other.creatorId && this.originProjectVersionId == other.originProjectVersionId && this.thresholds == other.thresholds && this.archived == other.archived && this.dateArchived == other.dateArchived && this.suggested == other.suggested && this.commentCount == other.commentCount && this.usesMlModel == other.usesMlModel && this.usesValidationDataset == other.usesValidationDataset && this.usesTrainingDataset == other.usesTrainingDataset && this.usesReferenceDataset == other.usesReferenceDataset && this.usesProductionData == other.usesProductionData && this.additionalProperties == other.additionalProperties /* spotless:on */ } + + private var hashCode: Int = 0 + + override fun hashCode(): Int { + if (hashCode == 0) { + hashCode = /* spotless:off */ Objects.hash(id, number, name, dateCreated, dateUpdated, description, evaluationWindow, delayWindow, type, subtype, creatorId, originProjectVersionId, thresholds, archived, dateArchived, suggested, commentCount, usesMlModel, usesValidationDataset, usesTrainingDataset, usesReferenceDataset, usesProductionData, additionalProperties) /* spotless:on */ + } + return hashCode + } + + override fun toString() = + "Goal{id=$id, number=$number, name=$name, dateCreated=$dateCreated, dateUpdated=$dateUpdated, description=$description, evaluationWindow=$evaluationWindow, delayWindow=$delayWindow, type=$type, subtype=$subtype, creatorId=$creatorId, originProjectVersionId=$originProjectVersionId, thresholds=$thresholds, archived=$archived, dateArchived=$dateArchived, suggested=$suggested, commentCount=$commentCount, usesMlModel=$usesMlModel, usesValidationDataset=$usesValidationDataset, usesTrainingDataset=$usesTrainingDataset, usesReferenceDataset=$usesReferenceDataset, usesProductionData=$usesProductionData, additionalProperties=$additionalProperties}" + } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is Item && this.id == other.id && this.goal == other.goal && this.goalId == other.goalId && this.projectVersionId == other.projectVersionId && this.inferencePipelineId == other.inferencePipelineId && this.dateCreated == other.dateCreated && this.dateUpdated == other.dateUpdated && this.dateDataStarts == other.dateDataStarts && this.dateDataEnds == other.dateDataEnds && this.status == other.status && this.statusMessage == other.statusMessage && this.additionalProperties == other.additionalProperties /* spotless:on */ } + + private var hashCode: Int = 0 + + override fun hashCode(): Int { + if (hashCode == 0) { + hashCode = /* spotless:off */ Objects.hash(id, goal, goalId, projectVersionId, inferencePipelineId, dateCreated, dateUpdated, dateDataStarts, dateDataEnds, status, statusMessage, additionalProperties) /* spotless:on */ + } + return hashCode + } + + override fun toString() = + "Item{id=$id, goal=$goal, goalId=$goalId, projectVersionId=$projectVersionId, inferencePipelineId=$inferencePipelineId, dateCreated=$dateCreated, dateUpdated=$dateUpdated, dateDataStarts=$dateDataStarts, dateDataEnds=$dateDataEnds, status=$status, statusMessage=$statusMessage, additionalProperties=$additionalProperties}" } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is CommitTestResultListResponse && this.items == other.items && this.additionalProperties == other.additionalProperties /* spotless:on */ + } + + private var hashCode: Int = 0 + + override fun hashCode(): Int { + if (hashCode == 0) { + hashCode = /* spotless:off */ Objects.hash(items, additionalProperties) /* spotless:on */ + } + return hashCode + } + + override fun toString() = + "CommitTestResultListResponse{items=$items, additionalProperties=$additionalProperties}" } diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/InferencePipelineDataStreamParams.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/InferencePipelineDataStreamParams.kt index 62d6be9..e30f47a 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/InferencePipelineDataStreamParams.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/InferencePipelineDataStreamParams.kt @@ -20,7 +20,9 @@ import com.openlayer.api.core.JsonMissing import com.openlayer.api.core.JsonValue import com.openlayer.api.core.NoAutoDetect import com.openlayer.api.core.getOrThrow -import com.openlayer.api.core.toUnmodifiable +import com.openlayer.api.core.http.Headers +import com.openlayer.api.core.http.QueryParams +import com.openlayer.api.core.toImmutable import com.openlayer.api.errors.OpenlayerInvalidDataException import com.openlayer.api.models.* import java.util.Objects @@ -31,8 +33,8 @@ constructor( private val inferencePipelineId: String, private val config: Config, private val rows: List, - private val additionalQueryParams: Map>, - private val additionalHeaders: Map>, + private val additionalHeaders: Headers, + private val additionalQueryParams: QueryParams, private val additionalBodyProperties: Map, ) { @@ -51,9 +53,9 @@ constructor( ) } - @JvmSynthetic internal fun getQueryParams(): Map> = additionalQueryParams + @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders - @JvmSynthetic internal fun getHeaders(): Map> = additionalHeaders + @JvmSynthetic internal fun getQueryParams(): QueryParams = additionalQueryParams fun getPathParam(index: Int): String { return when (index) { @@ -71,8 +73,6 @@ constructor( private val additionalProperties: Map, ) { - private var hashCode: Int = 0 - /** Configuration for the data stream. Depends on your **Openlayer project task type**. */ @JsonProperty("config") fun config(): Config? = config @@ -85,32 +85,6 @@ constructor( fun toBuilder() = Builder().from(this) - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return other is InferencePipelineDataStreamBody && - this.config == other.config && - this.rows == other.rows && - this.additionalProperties == other.additionalProperties - } - - override fun hashCode(): Int { - if (hashCode == 0) { - hashCode = - Objects.hash( - config, - rows, - additionalProperties, - ) - } - return hashCode - } - - override fun toString() = - "InferencePipelineDataStreamBody{config=$config, rows=$rows, additionalProperties=$additionalProperties}" - companion object { @JvmStatic fun builder() = Builder() @@ -155,15 +129,35 @@ constructor( fun build(): InferencePipelineDataStreamBody = InferencePipelineDataStreamBody( checkNotNull(config) { "`config` is required but was not set" }, - checkNotNull(rows) { "`rows` is required but was not set" }.toUnmodifiable(), - additionalProperties.toUnmodifiable(), + checkNotNull(rows) { "`rows` is required but was not set" }.toImmutable(), + additionalProperties.toImmutable(), ) } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is InferencePipelineDataStreamBody && this.config == other.config && this.rows == other.rows && this.additionalProperties == other.additionalProperties /* spotless:on */ + } + + private var hashCode: Int = 0 + + override fun hashCode(): Int { + if (hashCode == 0) { + hashCode = /* spotless:off */ Objects.hash(config, rows, additionalProperties) /* spotless:on */ + } + return hashCode + } + + override fun toString() = + "InferencePipelineDataStreamBody{config=$config, rows=$rows, additionalProperties=$additionalProperties}" } - fun _additionalQueryParams(): Map> = additionalQueryParams + fun _additionalHeaders(): Headers = additionalHeaders - fun _additionalHeaders(): Map> = additionalHeaders + fun _additionalQueryParams(): QueryParams = additionalQueryParams fun _additionalBodyProperties(): Map = additionalBodyProperties @@ -172,28 +166,15 @@ constructor( return true } - return other is InferencePipelineDataStreamParams && - this.inferencePipelineId == other.inferencePipelineId && - this.config == other.config && - this.rows == other.rows && - this.additionalQueryParams == other.additionalQueryParams && - this.additionalHeaders == other.additionalHeaders && - this.additionalBodyProperties == other.additionalBodyProperties + return /* spotless:off */ other is InferencePipelineDataStreamParams && this.inferencePipelineId == other.inferencePipelineId && this.config == other.config && this.rows == other.rows && this.additionalHeaders == other.additionalHeaders && this.additionalQueryParams == other.additionalQueryParams && this.additionalBodyProperties == other.additionalBodyProperties /* spotless:on */ } override fun hashCode(): Int { - return Objects.hash( - inferencePipelineId, - config, - rows, - additionalQueryParams, - additionalHeaders, - additionalBodyProperties, - ) + return /* spotless:off */ Objects.hash(inferencePipelineId, config, rows, additionalHeaders, additionalQueryParams, additionalBodyProperties) /* spotless:on */ } override fun toString() = - "InferencePipelineDataStreamParams{inferencePipelineId=$inferencePipelineId, config=$config, rows=$rows, additionalQueryParams=$additionalQueryParams, additionalHeaders=$additionalHeaders, additionalBodyProperties=$additionalBodyProperties}" + "InferencePipelineDataStreamParams{inferencePipelineId=$inferencePipelineId, config=$config, rows=$rows, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams, additionalBodyProperties=$additionalBodyProperties}" fun toBuilder() = Builder().from(this) @@ -208,8 +189,8 @@ constructor( private var inferencePipelineId: String? = null private var config: Config? = null private var rows: MutableList = mutableListOf() - private var additionalQueryParams: MutableMap> = mutableMapOf() - private var additionalHeaders: MutableMap> = mutableMapOf() + private var additionalHeaders: Headers.Builder = Headers.builder() + private var additionalQueryParams: QueryParams.Builder = QueryParams.builder() private var additionalBodyProperties: MutableMap = mutableMapOf() @JvmSynthetic @@ -218,8 +199,8 @@ constructor( this.inferencePipelineId = inferencePipelineDataStreamParams.inferencePipelineId this.config = inferencePipelineDataStreamParams.config this.rows(inferencePipelineDataStreamParams.rows) - additionalQueryParams(inferencePipelineDataStreamParams.additionalQueryParams) additionalHeaders(inferencePipelineDataStreamParams.additionalHeaders) + additionalQueryParams(inferencePipelineDataStreamParams.additionalQueryParams) additionalBodyProperties(inferencePipelineDataStreamParams.additionalBodyProperties) } @@ -257,53 +238,111 @@ constructor( /** A list of inference data points with inputs and outputs */ fun addRow(row: Row) = apply { this.rows.add(row) } - fun additionalQueryParams(additionalQueryParams: Map>) = apply { - this.additionalQueryParams.clear() - putAllQueryParams(additionalQueryParams) + fun additionalHeaders(additionalHeaders: Headers) = apply { + this.additionalHeaders.clear() + putAllAdditionalHeaders(additionalHeaders) } - fun putQueryParam(name: String, value: String) = apply { - this.additionalQueryParams.getOrPut(name) { mutableListOf() }.add(value) + fun additionalHeaders(additionalHeaders: Map>) = apply { + this.additionalHeaders.clear() + putAllAdditionalHeaders(additionalHeaders) } - fun putQueryParams(name: String, values: Iterable) = apply { - this.additionalQueryParams.getOrPut(name) { mutableListOf() }.addAll(values) + fun putAdditionalHeader(name: String, value: String) = apply { + additionalHeaders.put(name, value) } - fun putAllQueryParams(additionalQueryParams: Map>) = apply { - additionalQueryParams.forEach(this::putQueryParams) + fun putAdditionalHeaders(name: String, values: Iterable) = apply { + additionalHeaders.put(name, values) } - fun removeQueryParam(name: String) = apply { - this.additionalQueryParams.put(name, mutableListOf()) + fun putAllAdditionalHeaders(additionalHeaders: Headers) = apply { + this.additionalHeaders.putAll(additionalHeaders) } - fun additionalHeaders(additionalHeaders: Map>) = apply { - this.additionalHeaders.clear() - putAllHeaders(additionalHeaders) + fun putAllAdditionalHeaders(additionalHeaders: Map>) = apply { + this.additionalHeaders.putAll(additionalHeaders) + } + + fun replaceAdditionalHeaders(name: String, value: String) = apply { + additionalHeaders.replace(name, value) + } + + fun replaceAdditionalHeaders(name: String, values: Iterable) = apply { + additionalHeaders.replace(name, values) + } + + fun replaceAllAdditionalHeaders(additionalHeaders: Headers) = apply { + this.additionalHeaders.replaceAll(additionalHeaders) + } + + fun replaceAllAdditionalHeaders(additionalHeaders: Map>) = apply { + this.additionalHeaders.replaceAll(additionalHeaders) } - fun putHeader(name: String, value: String) = apply { - this.additionalHeaders.getOrPut(name) { mutableListOf() }.add(value) + fun removeAdditionalHeaders(name: String) = apply { additionalHeaders.remove(name) } + + fun removeAllAdditionalHeaders(names: Set) = apply { + additionalHeaders.removeAll(names) + } + + fun additionalQueryParams(additionalQueryParams: QueryParams) = apply { + this.additionalQueryParams.clear() + putAllAdditionalQueryParams(additionalQueryParams) + } + + fun additionalQueryParams(additionalQueryParams: Map>) = apply { + this.additionalQueryParams.clear() + putAllAdditionalQueryParams(additionalQueryParams) } - fun putHeaders(name: String, values: Iterable) = apply { - this.additionalHeaders.getOrPut(name) { mutableListOf() }.addAll(values) + fun putAdditionalQueryParam(key: String, value: String) = apply { + additionalQueryParams.put(key, value) } - fun putAllHeaders(additionalHeaders: Map>) = apply { - additionalHeaders.forEach(this::putHeaders) + fun putAdditionalQueryParams(key: String, values: Iterable) = apply { + additionalQueryParams.put(key, values) } - fun removeHeader(name: String) = apply { this.additionalHeaders.put(name, mutableListOf()) } + fun putAllAdditionalQueryParams(additionalQueryParams: QueryParams) = apply { + this.additionalQueryParams.putAll(additionalQueryParams) + } + + fun putAllAdditionalQueryParams(additionalQueryParams: Map>) = + apply { + this.additionalQueryParams.putAll(additionalQueryParams) + } + + fun replaceAdditionalQueryParams(key: String, value: String) = apply { + additionalQueryParams.replace(key, value) + } + + fun replaceAdditionalQueryParams(key: String, values: Iterable) = apply { + additionalQueryParams.replace(key, values) + } + + fun replaceAllAdditionalQueryParams(additionalQueryParams: QueryParams) = apply { + this.additionalQueryParams.replaceAll(additionalQueryParams) + } + + fun replaceAllAdditionalQueryParams(additionalQueryParams: Map>) = + apply { + this.additionalQueryParams.replaceAll(additionalQueryParams) + } + + fun removeAdditionalQueryParams(key: String) = apply { additionalQueryParams.remove(key) } + + fun removeAllAdditionalQueryParams(keys: Set) = apply { + additionalQueryParams.removeAll(keys) + } fun additionalBodyProperties(additionalBodyProperties: Map) = apply { this.additionalBodyProperties.clear() - this.additionalBodyProperties.putAll(additionalBodyProperties) + putAllAdditionalBodyProperties(additionalBodyProperties) } fun putAdditionalBodyProperty(key: String, value: JsonValue) = apply { - this.additionalBodyProperties.put(key, value) + additionalBodyProperties.put(key, value) } fun putAllAdditionalBodyProperties(additionalBodyProperties: Map) = @@ -311,16 +350,24 @@ constructor( this.additionalBodyProperties.putAll(additionalBodyProperties) } + fun removeAdditionalBodyProperty(key: String) = apply { + additionalBodyProperties.remove(key) + } + + fun removeAllAdditionalBodyProperties(keys: Set) = apply { + keys.forEach(::removeAdditionalBodyProperty) + } + fun build(): InferencePipelineDataStreamParams = InferencePipelineDataStreamParams( checkNotNull(inferencePipelineId) { "`inferencePipelineId` is required but was not set" }, checkNotNull(config) { "`config` is required but was not set" }, - checkNotNull(rows) { "`rows` is required but was not set" }.toUnmodifiable(), - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + checkNotNull(rows) { "`rows` is required but was not set" }.toImmutable(), + additionalHeaders.build(), + additionalQueryParams.build(), + additionalBodyProperties.toImmutable(), ) } @@ -405,20 +452,11 @@ constructor( return true } - return other is Config && - this.llmData == other.llmData && - this.tabularClassificationData == other.tabularClassificationData && - this.tabularRegressionData == other.tabularRegressionData && - this.textClassificationData == other.textClassificationData + return /* spotless:off */ other is Config && this.llmData == other.llmData && this.tabularClassificationData == other.tabularClassificationData && this.tabularRegressionData == other.tabularRegressionData && this.textClassificationData == other.textClassificationData /* spotless:on */ } override fun hashCode(): Int { - return Objects.hash( - llmData, - tabularClassificationData, - tabularRegressionData, - textClassificationData, - ) + return /* spotless:off */ Objects.hash(llmData, tabularClassificationData, tabularRegressionData, textClassificationData) /* spotless:on */ } override fun toString(): String { @@ -473,6 +511,7 @@ constructor( override fun ObjectCodec.deserialize(node: JsonNode): Config { val json = JsonValue.fromJsonNode(node) + tryDeserialize(node, jacksonTypeRef()) { it.validate() } ?.let { return Config(llmData = it, _json = json) @@ -536,8 +575,6 @@ constructor( private var validated: Boolean = false - private var hashCode: Int = 0 - /** Name of the column with the total number of tokens. */ fun numOfTokenColumnName(): Optional = Optional.ofNullable(numOfTokenColumnName.getNullable("numOfTokenColumnName")) @@ -681,52 +718,6 @@ constructor( fun toBuilder() = Builder().from(this) - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return other is LlmData && - this.numOfTokenColumnName == other.numOfTokenColumnName && - this.contextColumnName == other.contextColumnName && - this.costColumnName == other.costColumnName && - this.groundTruthColumnName == other.groundTruthColumnName && - this.inferenceIdColumnName == other.inferenceIdColumnName && - this.inputVariableNames == other.inputVariableNames && - this.latencyColumnName == other.latencyColumnName && - this.metadata == other.metadata && - this.outputColumnName == other.outputColumnName && - this.prompt == other.prompt && - this.questionColumnName == other.questionColumnName && - this.timestampColumnName == other.timestampColumnName && - this.additionalProperties == other.additionalProperties - } - - override fun hashCode(): Int { - if (hashCode == 0) { - hashCode = - Objects.hash( - numOfTokenColumnName, - contextColumnName, - costColumnName, - groundTruthColumnName, - inferenceIdColumnName, - inputVariableNames, - latencyColumnName, - metadata, - outputColumnName, - prompt, - questionColumnName, - timestampColumnName, - additionalProperties, - ) - } - return hashCode - } - - override fun toString() = - "LlmData{numOfTokenColumnName=$numOfTokenColumnName, contextColumnName=$contextColumnName, costColumnName=$costColumnName, groundTruthColumnName=$groundTruthColumnName, inferenceIdColumnName=$inferenceIdColumnName, inputVariableNames=$inputVariableNames, latencyColumnName=$latencyColumnName, metadata=$metadata, outputColumnName=$outputColumnName, prompt=$prompt, questionColumnName=$questionColumnName, timestampColumnName=$timestampColumnName, additionalProperties=$additionalProperties}" - companion object { @JvmStatic fun builder() = Builder() @@ -940,14 +931,14 @@ constructor( costColumnName, groundTruthColumnName, inferenceIdColumnName, - inputVariableNames.map { it.toUnmodifiable() }, + inputVariableNames.map { it.toImmutable() }, latencyColumnName, metadata, outputColumnName, - prompt.map { it.toUnmodifiable() }, + prompt.map { it.toImmutable() }, questionColumnName, timestampColumnName, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -962,8 +953,6 @@ constructor( private var validated: Boolean = false - private var hashCode: Int = 0 - /** Role of the prompt. */ fun role(): Optional = Optional.ofNullable(role.getNullable("role")) @@ -991,32 +980,6 @@ constructor( fun toBuilder() = Builder().from(this) - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return other is Prompt && - this.role == other.role && - this.content == other.content && - this.additionalProperties == other.additionalProperties - } - - override fun hashCode(): Int { - if (hashCode == 0) { - hashCode = - Objects.hash( - role, - content, - additionalProperties, - ) - } - return hashCode - } - - override fun toString() = - "Prompt{role=$role, content=$content, additionalProperties=$additionalProperties}" - companion object { @JvmStatic fun builder() = Builder() @@ -1070,10 +1033,50 @@ constructor( Prompt( role, content, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is Prompt && this.role == other.role && this.content == other.content && this.additionalProperties == other.additionalProperties /* spotless:on */ + } + + private var hashCode: Int = 0 + + override fun hashCode(): Int { + if (hashCode == 0) { + hashCode = /* spotless:off */ Objects.hash(role, content, additionalProperties) /* spotless:on */ + } + return hashCode + } + + override fun toString() = + "Prompt{role=$role, content=$content, additionalProperties=$additionalProperties}" + } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is LlmData && this.numOfTokenColumnName == other.numOfTokenColumnName && this.contextColumnName == other.contextColumnName && this.costColumnName == other.costColumnName && this.groundTruthColumnName == other.groundTruthColumnName && this.inferenceIdColumnName == other.inferenceIdColumnName && this.inputVariableNames == other.inputVariableNames && this.latencyColumnName == other.latencyColumnName && this.metadata == other.metadata && this.outputColumnName == other.outputColumnName && this.prompt == other.prompt && this.questionColumnName == other.questionColumnName && this.timestampColumnName == other.timestampColumnName && this.additionalProperties == other.additionalProperties /* spotless:on */ + } + + private var hashCode: Int = 0 + + override fun hashCode(): Int { + if (hashCode == 0) { + hashCode = /* spotless:off */ Objects.hash(numOfTokenColumnName, contextColumnName, costColumnName, groundTruthColumnName, inferenceIdColumnName, inputVariableNames, latencyColumnName, metadata, outputColumnName, prompt, questionColumnName, timestampColumnName, additionalProperties) /* spotless:on */ + } + return hashCode } + + override fun toString() = + "LlmData{numOfTokenColumnName=$numOfTokenColumnName, contextColumnName=$contextColumnName, costColumnName=$costColumnName, groundTruthColumnName=$groundTruthColumnName, inferenceIdColumnName=$inferenceIdColumnName, inputVariableNames=$inputVariableNames, latencyColumnName=$latencyColumnName, metadata=$metadata, outputColumnName=$outputColumnName, prompt=$prompt, questionColumnName=$questionColumnName, timestampColumnName=$timestampColumnName, additionalProperties=$additionalProperties}" } @JsonDeserialize(builder = TabularClassificationData.Builder::class) @@ -1095,8 +1098,6 @@ constructor( private var validated: Boolean = false - private var hashCode: Int = 0 - /** * Array with the names of all categorical features in the dataset. E.g. * ["Age", "Geography"]. @@ -1233,48 +1234,6 @@ constructor( fun toBuilder() = Builder().from(this) - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return other is TabularClassificationData && - this.categoricalFeatureNames == other.categoricalFeatureNames && - this.classNames == other.classNames && - this.featureNames == other.featureNames && - this.inferenceIdColumnName == other.inferenceIdColumnName && - this.labelColumnName == other.labelColumnName && - this.latencyColumnName == other.latencyColumnName && - this.metadata == other.metadata && - this.predictionsColumnName == other.predictionsColumnName && - this.predictionScoresColumnName == other.predictionScoresColumnName && - this.timestampColumnName == other.timestampColumnName && - this.additionalProperties == other.additionalProperties - } - - override fun hashCode(): Int { - if (hashCode == 0) { - hashCode = - Objects.hash( - categoricalFeatureNames, - classNames, - featureNames, - inferenceIdColumnName, - labelColumnName, - latencyColumnName, - metadata, - predictionsColumnName, - predictionScoresColumnName, - timestampColumnName, - additionalProperties, - ) - } - return hashCode - } - - override fun toString() = - "TabularClassificationData{categoricalFeatureNames=$categoricalFeatureNames, classNames=$classNames, featureNames=$featureNames, inferenceIdColumnName=$inferenceIdColumnName, labelColumnName=$labelColumnName, latencyColumnName=$latencyColumnName, metadata=$metadata, predictionsColumnName=$predictionsColumnName, predictionScoresColumnName=$predictionScoresColumnName, timestampColumnName=$timestampColumnName, additionalProperties=$additionalProperties}" - companion object { @JvmStatic fun builder() = Builder() @@ -1470,9 +1429,9 @@ constructor( fun build(): TabularClassificationData = TabularClassificationData( - categoricalFeatureNames.map { it.toUnmodifiable() }, - classNames.map { it.toUnmodifiable() }, - featureNames.map { it.toUnmodifiable() }, + categoricalFeatureNames.map { it.toImmutable() }, + classNames.map { it.toImmutable() }, + featureNames.map { it.toImmutable() }, inferenceIdColumnName, labelColumnName, latencyColumnName, @@ -1480,9 +1439,29 @@ constructor( predictionsColumnName, predictionScoresColumnName, timestampColumnName, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is TabularClassificationData && this.categoricalFeatureNames == other.categoricalFeatureNames && this.classNames == other.classNames && this.featureNames == other.featureNames && this.inferenceIdColumnName == other.inferenceIdColumnName && this.labelColumnName == other.labelColumnName && this.latencyColumnName == other.latencyColumnName && this.metadata == other.metadata && this.predictionsColumnName == other.predictionsColumnName && this.predictionScoresColumnName == other.predictionScoresColumnName && this.timestampColumnName == other.timestampColumnName && this.additionalProperties == other.additionalProperties /* spotless:on */ + } + + private var hashCode: Int = 0 + + override fun hashCode(): Int { + if (hashCode == 0) { + hashCode = /* spotless:off */ Objects.hash(categoricalFeatureNames, classNames, featureNames, inferenceIdColumnName, labelColumnName, latencyColumnName, metadata, predictionsColumnName, predictionScoresColumnName, timestampColumnName, additionalProperties) /* spotless:on */ + } + return hashCode + } + + override fun toString() = + "TabularClassificationData{categoricalFeatureNames=$categoricalFeatureNames, classNames=$classNames, featureNames=$featureNames, inferenceIdColumnName=$inferenceIdColumnName, labelColumnName=$labelColumnName, latencyColumnName=$latencyColumnName, metadata=$metadata, predictionsColumnName=$predictionsColumnName, predictionScoresColumnName=$predictionScoresColumnName, timestampColumnName=$timestampColumnName, additionalProperties=$additionalProperties}" } @JsonDeserialize(builder = TabularRegressionData.Builder::class) @@ -1502,8 +1481,6 @@ constructor( private var validated: Boolean = false - private var hashCode: Int = 0 - /** * Array with the names of all categorical features in the dataset. E.g. * ["Gender", "Geography"]. @@ -1605,44 +1582,6 @@ constructor( fun toBuilder() = Builder().from(this) - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return other is TabularRegressionData && - this.categoricalFeatureNames == other.categoricalFeatureNames && - this.featureNames == other.featureNames && - this.inferenceIdColumnName == other.inferenceIdColumnName && - this.latencyColumnName == other.latencyColumnName && - this.metadata == other.metadata && - this.predictionsColumnName == other.predictionsColumnName && - this.targetColumnName == other.targetColumnName && - this.timestampColumnName == other.timestampColumnName && - this.additionalProperties == other.additionalProperties - } - - override fun hashCode(): Int { - if (hashCode == 0) { - hashCode = - Objects.hash( - categoricalFeatureNames, - featureNames, - inferenceIdColumnName, - latencyColumnName, - metadata, - predictionsColumnName, - targetColumnName, - timestampColumnName, - additionalProperties, - ) - } - return hashCode - } - - override fun toString() = - "TabularRegressionData{categoricalFeatureNames=$categoricalFeatureNames, featureNames=$featureNames, inferenceIdColumnName=$inferenceIdColumnName, latencyColumnName=$latencyColumnName, metadata=$metadata, predictionsColumnName=$predictionsColumnName, targetColumnName=$targetColumnName, timestampColumnName=$timestampColumnName, additionalProperties=$additionalProperties}" - companion object { @JvmStatic fun builder() = Builder() @@ -1793,17 +1732,37 @@ constructor( fun build(): TabularRegressionData = TabularRegressionData( - categoricalFeatureNames.map { it.toUnmodifiable() }, - featureNames.map { it.toUnmodifiable() }, + categoricalFeatureNames.map { it.toImmutable() }, + featureNames.map { it.toImmutable() }, inferenceIdColumnName, latencyColumnName, metadata, predictionsColumnName, targetColumnName, timestampColumnName, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is TabularRegressionData && this.categoricalFeatureNames == other.categoricalFeatureNames && this.featureNames == other.featureNames && this.inferenceIdColumnName == other.inferenceIdColumnName && this.latencyColumnName == other.latencyColumnName && this.metadata == other.metadata && this.predictionsColumnName == other.predictionsColumnName && this.targetColumnName == other.targetColumnName && this.timestampColumnName == other.timestampColumnName && this.additionalProperties == other.additionalProperties /* spotless:on */ + } + + private var hashCode: Int = 0 + + override fun hashCode(): Int { + if (hashCode == 0) { + hashCode = /* spotless:off */ Objects.hash(categoricalFeatureNames, featureNames, inferenceIdColumnName, latencyColumnName, metadata, predictionsColumnName, targetColumnName, timestampColumnName, additionalProperties) /* spotless:on */ + } + return hashCode + } + + override fun toString() = + "TabularRegressionData{categoricalFeatureNames=$categoricalFeatureNames, featureNames=$featureNames, inferenceIdColumnName=$inferenceIdColumnName, latencyColumnName=$latencyColumnName, metadata=$metadata, predictionsColumnName=$predictionsColumnName, targetColumnName=$targetColumnName, timestampColumnName=$timestampColumnName, additionalProperties=$additionalProperties}" } @JsonDeserialize(builder = TextClassificationData.Builder::class) @@ -1824,8 +1783,6 @@ constructor( private var validated: Boolean = false - private var hashCode: Int = 0 - /** * List of class names indexed by label integer in the dataset. E.g. * ["Retained", "Exited"] when 0, 1 are in your label column. @@ -1946,46 +1903,6 @@ constructor( fun toBuilder() = Builder().from(this) - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return other is TextClassificationData && - this.classNames == other.classNames && - this.inferenceIdColumnName == other.inferenceIdColumnName && - this.labelColumnName == other.labelColumnName && - this.latencyColumnName == other.latencyColumnName && - this.metadata == other.metadata && - this.predictionsColumnName == other.predictionsColumnName && - this.predictionScoresColumnName == other.predictionScoresColumnName && - this.textColumnName == other.textColumnName && - this.timestampColumnName == other.timestampColumnName && - this.additionalProperties == other.additionalProperties - } - - override fun hashCode(): Int { - if (hashCode == 0) { - hashCode = - Objects.hash( - classNames, - inferenceIdColumnName, - labelColumnName, - latencyColumnName, - metadata, - predictionsColumnName, - predictionScoresColumnName, - textColumnName, - timestampColumnName, - additionalProperties, - ) - } - return hashCode - } - - override fun toString() = - "TextClassificationData{classNames=$classNames, inferenceIdColumnName=$inferenceIdColumnName, labelColumnName=$labelColumnName, latencyColumnName=$latencyColumnName, metadata=$metadata, predictionsColumnName=$predictionsColumnName, predictionScoresColumnName=$predictionScoresColumnName, textColumnName=$textColumnName, timestampColumnName=$timestampColumnName, additionalProperties=$additionalProperties}" - companion object { @JvmStatic fun builder() = Builder() @@ -2161,7 +2078,7 @@ constructor( fun build(): TextClassificationData = TextClassificationData( - classNames.map { it.toUnmodifiable() }, + classNames.map { it.toImmutable() }, inferenceIdColumnName, labelColumnName, latencyColumnName, @@ -2170,9 +2087,29 @@ constructor( predictionScoresColumnName, textColumnName, timestampColumnName, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is TextClassificationData && this.classNames == other.classNames && this.inferenceIdColumnName == other.inferenceIdColumnName && this.labelColumnName == other.labelColumnName && this.latencyColumnName == other.latencyColumnName && this.metadata == other.metadata && this.predictionsColumnName == other.predictionsColumnName && this.predictionScoresColumnName == other.predictionScoresColumnName && this.textColumnName == other.textColumnName && this.timestampColumnName == other.timestampColumnName && this.additionalProperties == other.additionalProperties /* spotless:on */ + } + + private var hashCode: Int = 0 + + override fun hashCode(): Int { + if (hashCode == 0) { + hashCode = /* spotless:off */ Objects.hash(classNames, inferenceIdColumnName, labelColumnName, latencyColumnName, metadata, predictionsColumnName, predictionScoresColumnName, textColumnName, timestampColumnName, additionalProperties) /* spotless:on */ + } + return hashCode + } + + override fun toString() = + "TextClassificationData{classNames=$classNames, inferenceIdColumnName=$inferenceIdColumnName, labelColumnName=$labelColumnName, latencyColumnName=$latencyColumnName, metadata=$metadata, predictionsColumnName=$predictionsColumnName, predictionScoresColumnName=$predictionScoresColumnName, textColumnName=$textColumnName, timestampColumnName=$timestampColumnName, additionalProperties=$additionalProperties}" } } @@ -2183,31 +2120,12 @@ constructor( private val additionalProperties: Map, ) { - private var hashCode: Int = 0 - @JsonAnyGetter @ExcludeMissing fun _additionalProperties(): Map = additionalProperties fun toBuilder() = Builder().from(this) - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return other is Row && this.additionalProperties == other.additionalProperties - } - - override fun hashCode(): Int { - if (hashCode == 0) { - hashCode = Objects.hash(additionalProperties) - } - return hashCode - } - - override fun toString() = "Row{additionalProperties=$additionalProperties}" - companion object { @JvmStatic fun builder() = Builder() @@ -2234,7 +2152,26 @@ constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): Row = Row(additionalProperties.toUnmodifiable()) + fun build(): Row = Row(additionalProperties.toImmutable()) + } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is Row && this.additionalProperties == other.additionalProperties /* spotless:on */ } + + private var hashCode: Int = 0 + + override fun hashCode(): Int { + if (hashCode == 0) { + hashCode = /* spotless:off */ Objects.hash(additionalProperties) /* spotless:on */ + } + return hashCode + } + + override fun toString() = "Row{additionalProperties=$additionalProperties}" } } diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/InferencePipelineDataStreamResponse.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/InferencePipelineDataStreamResponse.kt index 087ceda..3d53c52 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/InferencePipelineDataStreamResponse.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/InferencePipelineDataStreamResponse.kt @@ -13,7 +13,7 @@ import com.openlayer.api.core.JsonField import com.openlayer.api.core.JsonMissing import com.openlayer.api.core.JsonValue import com.openlayer.api.core.NoAutoDetect -import com.openlayer.api.core.toUnmodifiable +import com.openlayer.api.core.toImmutable import com.openlayer.api.errors.OpenlayerInvalidDataException import java.util.Objects @@ -27,8 +27,6 @@ private constructor( private var validated: Boolean = false - private var hashCode: Int = 0 - fun success(): Success = success.getRequired("success") @JsonProperty("success") @ExcludeMissing fun _success() = success @@ -46,26 +44,6 @@ private constructor( fun toBuilder() = Builder().from(this) - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return other is InferencePipelineDataStreamResponse && - this.success == other.success && - this.additionalProperties == other.additionalProperties - } - - override fun hashCode(): Int { - if (hashCode == 0) { - hashCode = Objects.hash(success, additionalProperties) - } - return hashCode - } - - override fun toString() = - "InferencePipelineDataStreamResponse{success=$success, additionalProperties=$additionalProperties}" - companion object { @JvmStatic fun builder() = Builder() @@ -105,7 +83,7 @@ private constructor( } fun build(): InferencePipelineDataStreamResponse = - InferencePipelineDataStreamResponse(success, additionalProperties.toUnmodifiable()) + InferencePipelineDataStreamResponse(success, additionalProperties.toImmutable()) } class Success @@ -121,7 +99,7 @@ private constructor( return true } - return other is Success && this.value == other.value + return /* spotless:off */ other is Success && this.value == other.value /* spotless:on */ } override fun hashCode() = value.hashCode() @@ -158,4 +136,24 @@ private constructor( fun asString(): String = _value().asStringOrThrow() } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is InferencePipelineDataStreamResponse && this.success == other.success && this.additionalProperties == other.additionalProperties /* spotless:on */ + } + + private var hashCode: Int = 0 + + override fun hashCode(): Int { + if (hashCode == 0) { + hashCode = /* spotless:off */ Objects.hash(success, additionalProperties) /* spotless:on */ + } + return hashCode + } + + override fun toString() = + "InferencePipelineDataStreamResponse{success=$success, additionalProperties=$additionalProperties}" } diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/InferencePipelineDeleteParams.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/InferencePipelineDeleteParams.kt index 623bef1..709bf37 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/InferencePipelineDeleteParams.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/InferencePipelineDeleteParams.kt @@ -4,7 +4,9 @@ package com.openlayer.api.models import com.openlayer.api.core.JsonValue import com.openlayer.api.core.NoAutoDetect -import com.openlayer.api.core.toUnmodifiable +import com.openlayer.api.core.http.Headers +import com.openlayer.api.core.http.QueryParams +import com.openlayer.api.core.toImmutable import com.openlayer.api.models.* import java.util.Objects import java.util.Optional @@ -12,8 +14,8 @@ import java.util.Optional class InferencePipelineDeleteParams constructor( private val inferencePipelineId: String, - private val additionalQueryParams: Map>, - private val additionalHeaders: Map>, + private val additionalHeaders: Headers, + private val additionalQueryParams: QueryParams, private val additionalBodyProperties: Map, ) { @@ -24,9 +26,9 @@ constructor( return Optional.ofNullable(additionalBodyProperties.ifEmpty { null }) } - @JvmSynthetic internal fun getQueryParams(): Map> = additionalQueryParams + @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders - @JvmSynthetic internal fun getHeaders(): Map> = additionalHeaders + @JvmSynthetic internal fun getQueryParams(): QueryParams = additionalQueryParams fun getPathParam(index: Int): String { return when (index) { @@ -35,9 +37,9 @@ constructor( } } - fun _additionalQueryParams(): Map> = additionalQueryParams + fun _additionalHeaders(): Headers = additionalHeaders - fun _additionalHeaders(): Map> = additionalHeaders + fun _additionalQueryParams(): QueryParams = additionalQueryParams fun _additionalBodyProperties(): Map = additionalBodyProperties @@ -46,24 +48,15 @@ constructor( return true } - return other is InferencePipelineDeleteParams && - this.inferencePipelineId == other.inferencePipelineId && - this.additionalQueryParams == other.additionalQueryParams && - this.additionalHeaders == other.additionalHeaders && - this.additionalBodyProperties == other.additionalBodyProperties + return /* spotless:off */ other is InferencePipelineDeleteParams && this.inferencePipelineId == other.inferencePipelineId && this.additionalHeaders == other.additionalHeaders && this.additionalQueryParams == other.additionalQueryParams && this.additionalBodyProperties == other.additionalBodyProperties /* spotless:on */ } override fun hashCode(): Int { - return Objects.hash( - inferencePipelineId, - additionalQueryParams, - additionalHeaders, - additionalBodyProperties, - ) + return /* spotless:off */ Objects.hash(inferencePipelineId, additionalHeaders, additionalQueryParams, additionalBodyProperties) /* spotless:on */ } override fun toString() = - "InferencePipelineDeleteParams{inferencePipelineId=$inferencePipelineId, additionalQueryParams=$additionalQueryParams, additionalHeaders=$additionalHeaders, additionalBodyProperties=$additionalBodyProperties}" + "InferencePipelineDeleteParams{inferencePipelineId=$inferencePipelineId, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams, additionalBodyProperties=$additionalBodyProperties}" fun toBuilder() = Builder().from(this) @@ -76,15 +69,15 @@ constructor( class Builder { private var inferencePipelineId: String? = null - private var additionalQueryParams: MutableMap> = mutableMapOf() - private var additionalHeaders: MutableMap> = mutableMapOf() + private var additionalHeaders: Headers.Builder = Headers.builder() + private var additionalQueryParams: QueryParams.Builder = QueryParams.builder() private var additionalBodyProperties: MutableMap = mutableMapOf() @JvmSynthetic internal fun from(inferencePipelineDeleteParams: InferencePipelineDeleteParams) = apply { this.inferencePipelineId = inferencePipelineDeleteParams.inferencePipelineId - additionalQueryParams(inferencePipelineDeleteParams.additionalQueryParams) additionalHeaders(inferencePipelineDeleteParams.additionalHeaders) + additionalQueryParams(inferencePipelineDeleteParams.additionalQueryParams) additionalBodyProperties(inferencePipelineDeleteParams.additionalBodyProperties) } @@ -92,53 +85,111 @@ constructor( this.inferencePipelineId = inferencePipelineId } - fun additionalQueryParams(additionalQueryParams: Map>) = apply { - this.additionalQueryParams.clear() - putAllQueryParams(additionalQueryParams) + fun additionalHeaders(additionalHeaders: Headers) = apply { + this.additionalHeaders.clear() + putAllAdditionalHeaders(additionalHeaders) } - fun putQueryParam(name: String, value: String) = apply { - this.additionalQueryParams.getOrPut(name) { mutableListOf() }.add(value) + fun additionalHeaders(additionalHeaders: Map>) = apply { + this.additionalHeaders.clear() + putAllAdditionalHeaders(additionalHeaders) } - fun putQueryParams(name: String, values: Iterable) = apply { - this.additionalQueryParams.getOrPut(name) { mutableListOf() }.addAll(values) + fun putAdditionalHeader(name: String, value: String) = apply { + additionalHeaders.put(name, value) } - fun putAllQueryParams(additionalQueryParams: Map>) = apply { - additionalQueryParams.forEach(this::putQueryParams) + fun putAdditionalHeaders(name: String, values: Iterable) = apply { + additionalHeaders.put(name, values) } - fun removeQueryParam(name: String) = apply { - this.additionalQueryParams.put(name, mutableListOf()) + fun putAllAdditionalHeaders(additionalHeaders: Headers) = apply { + this.additionalHeaders.putAll(additionalHeaders) } - fun additionalHeaders(additionalHeaders: Map>) = apply { - this.additionalHeaders.clear() - putAllHeaders(additionalHeaders) + fun putAllAdditionalHeaders(additionalHeaders: Map>) = apply { + this.additionalHeaders.putAll(additionalHeaders) + } + + fun replaceAdditionalHeaders(name: String, value: String) = apply { + additionalHeaders.replace(name, value) + } + + fun replaceAdditionalHeaders(name: String, values: Iterable) = apply { + additionalHeaders.replace(name, values) + } + + fun replaceAllAdditionalHeaders(additionalHeaders: Headers) = apply { + this.additionalHeaders.replaceAll(additionalHeaders) } - fun putHeader(name: String, value: String) = apply { - this.additionalHeaders.getOrPut(name) { mutableListOf() }.add(value) + fun replaceAllAdditionalHeaders(additionalHeaders: Map>) = apply { + this.additionalHeaders.replaceAll(additionalHeaders) } - fun putHeaders(name: String, values: Iterable) = apply { - this.additionalHeaders.getOrPut(name) { mutableListOf() }.addAll(values) + fun removeAdditionalHeaders(name: String) = apply { additionalHeaders.remove(name) } + + fun removeAllAdditionalHeaders(names: Set) = apply { + additionalHeaders.removeAll(names) } - fun putAllHeaders(additionalHeaders: Map>) = apply { - additionalHeaders.forEach(this::putHeaders) + fun additionalQueryParams(additionalQueryParams: QueryParams) = apply { + this.additionalQueryParams.clear() + putAllAdditionalQueryParams(additionalQueryParams) } - fun removeHeader(name: String) = apply { this.additionalHeaders.put(name, mutableListOf()) } + fun additionalQueryParams(additionalQueryParams: Map>) = apply { + this.additionalQueryParams.clear() + putAllAdditionalQueryParams(additionalQueryParams) + } + + fun putAdditionalQueryParam(key: String, value: String) = apply { + additionalQueryParams.put(key, value) + } + + fun putAdditionalQueryParams(key: String, values: Iterable) = apply { + additionalQueryParams.put(key, values) + } + + fun putAllAdditionalQueryParams(additionalQueryParams: QueryParams) = apply { + this.additionalQueryParams.putAll(additionalQueryParams) + } + + fun putAllAdditionalQueryParams(additionalQueryParams: Map>) = + apply { + this.additionalQueryParams.putAll(additionalQueryParams) + } + + fun replaceAdditionalQueryParams(key: String, value: String) = apply { + additionalQueryParams.replace(key, value) + } + + fun replaceAdditionalQueryParams(key: String, values: Iterable) = apply { + additionalQueryParams.replace(key, values) + } + + fun replaceAllAdditionalQueryParams(additionalQueryParams: QueryParams) = apply { + this.additionalQueryParams.replaceAll(additionalQueryParams) + } + + fun replaceAllAdditionalQueryParams(additionalQueryParams: Map>) = + apply { + this.additionalQueryParams.replaceAll(additionalQueryParams) + } + + fun removeAdditionalQueryParams(key: String) = apply { additionalQueryParams.remove(key) } + + fun removeAllAdditionalQueryParams(keys: Set) = apply { + additionalQueryParams.removeAll(keys) + } fun additionalBodyProperties(additionalBodyProperties: Map) = apply { this.additionalBodyProperties.clear() - this.additionalBodyProperties.putAll(additionalBodyProperties) + putAllAdditionalBodyProperties(additionalBodyProperties) } fun putAdditionalBodyProperty(key: String, value: JsonValue) = apply { - this.additionalBodyProperties.put(key, value) + additionalBodyProperties.put(key, value) } fun putAllAdditionalBodyProperties(additionalBodyProperties: Map) = @@ -146,14 +197,22 @@ constructor( this.additionalBodyProperties.putAll(additionalBodyProperties) } + fun removeAdditionalBodyProperty(key: String) = apply { + additionalBodyProperties.remove(key) + } + + fun removeAllAdditionalBodyProperties(keys: Set) = apply { + keys.forEach(::removeAdditionalBodyProperty) + } + fun build(): InferencePipelineDeleteParams = InferencePipelineDeleteParams( checkNotNull(inferencePipelineId) { "`inferencePipelineId` is required but was not set" }, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + additionalHeaders.build(), + additionalQueryParams.build(), + additionalBodyProperties.toImmutable(), ) } } diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/InferencePipelineRetrieveParams.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/InferencePipelineRetrieveParams.kt index 41a7dd7..950a922 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/InferencePipelineRetrieveParams.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/InferencePipelineRetrieveParams.kt @@ -3,22 +3,23 @@ package com.openlayer.api.models import com.openlayer.api.core.NoAutoDetect -import com.openlayer.api.core.toUnmodifiable +import com.openlayer.api.core.http.Headers +import com.openlayer.api.core.http.QueryParams import com.openlayer.api.models.* import java.util.Objects class InferencePipelineRetrieveParams constructor( private val inferencePipelineId: String, - private val additionalQueryParams: Map>, - private val additionalHeaders: Map>, + private val additionalHeaders: Headers, + private val additionalQueryParams: QueryParams, ) { fun inferencePipelineId(): String = inferencePipelineId - @JvmSynthetic internal fun getQueryParams(): Map> = additionalQueryParams + @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders - @JvmSynthetic internal fun getHeaders(): Map> = additionalHeaders + @JvmSynthetic internal fun getQueryParams(): QueryParams = additionalQueryParams fun getPathParam(index: Int): String { return when (index) { @@ -27,31 +28,24 @@ constructor( } } - fun _additionalQueryParams(): Map> = additionalQueryParams + fun _additionalHeaders(): Headers = additionalHeaders - fun _additionalHeaders(): Map> = additionalHeaders + fun _additionalQueryParams(): QueryParams = additionalQueryParams override fun equals(other: Any?): Boolean { if (this === other) { return true } - return other is InferencePipelineRetrieveParams && - this.inferencePipelineId == other.inferencePipelineId && - this.additionalQueryParams == other.additionalQueryParams && - this.additionalHeaders == other.additionalHeaders + return /* spotless:off */ other is InferencePipelineRetrieveParams && this.inferencePipelineId == other.inferencePipelineId && this.additionalHeaders == other.additionalHeaders && this.additionalQueryParams == other.additionalQueryParams /* spotless:on */ } override fun hashCode(): Int { - return Objects.hash( - inferencePipelineId, - additionalQueryParams, - additionalHeaders, - ) + return /* spotless:off */ Objects.hash(inferencePipelineId, additionalHeaders, additionalQueryParams) /* spotless:on */ } override fun toString() = - "InferencePipelineRetrieveParams{inferencePipelineId=$inferencePipelineId, additionalQueryParams=$additionalQueryParams, additionalHeaders=$additionalHeaders}" + "InferencePipelineRetrieveParams{inferencePipelineId=$inferencePipelineId, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams}" fun toBuilder() = Builder().from(this) @@ -64,68 +58,126 @@ constructor( class Builder { private var inferencePipelineId: String? = null - private var additionalQueryParams: MutableMap> = mutableMapOf() - private var additionalHeaders: MutableMap> = mutableMapOf() + private var additionalHeaders: Headers.Builder = Headers.builder() + private var additionalQueryParams: QueryParams.Builder = QueryParams.builder() @JvmSynthetic internal fun from(inferencePipelineRetrieveParams: InferencePipelineRetrieveParams) = apply { this.inferencePipelineId = inferencePipelineRetrieveParams.inferencePipelineId - additionalQueryParams(inferencePipelineRetrieveParams.additionalQueryParams) additionalHeaders(inferencePipelineRetrieveParams.additionalHeaders) + additionalQueryParams(inferencePipelineRetrieveParams.additionalQueryParams) } fun inferencePipelineId(inferencePipelineId: String) = apply { this.inferencePipelineId = inferencePipelineId } - fun additionalQueryParams(additionalQueryParams: Map>) = apply { - this.additionalQueryParams.clear() - putAllQueryParams(additionalQueryParams) + fun additionalHeaders(additionalHeaders: Headers) = apply { + this.additionalHeaders.clear() + putAllAdditionalHeaders(additionalHeaders) + } + + fun additionalHeaders(additionalHeaders: Map>) = apply { + this.additionalHeaders.clear() + putAllAdditionalHeaders(additionalHeaders) } - fun putQueryParam(name: String, value: String) = apply { - this.additionalQueryParams.getOrPut(name) { mutableListOf() }.add(value) + fun putAdditionalHeader(name: String, value: String) = apply { + additionalHeaders.put(name, value) } - fun putQueryParams(name: String, values: Iterable) = apply { - this.additionalQueryParams.getOrPut(name) { mutableListOf() }.addAll(values) + fun putAdditionalHeaders(name: String, values: Iterable) = apply { + additionalHeaders.put(name, values) } - fun putAllQueryParams(additionalQueryParams: Map>) = apply { - additionalQueryParams.forEach(this::putQueryParams) + fun putAllAdditionalHeaders(additionalHeaders: Headers) = apply { + this.additionalHeaders.putAll(additionalHeaders) } - fun removeQueryParam(name: String) = apply { - this.additionalQueryParams.put(name, mutableListOf()) + fun putAllAdditionalHeaders(additionalHeaders: Map>) = apply { + this.additionalHeaders.putAll(additionalHeaders) } - fun additionalHeaders(additionalHeaders: Map>) = apply { - this.additionalHeaders.clear() - putAllHeaders(additionalHeaders) + fun replaceAdditionalHeaders(name: String, value: String) = apply { + additionalHeaders.replace(name, value) } - fun putHeader(name: String, value: String) = apply { - this.additionalHeaders.getOrPut(name) { mutableListOf() }.add(value) + fun replaceAdditionalHeaders(name: String, values: Iterable) = apply { + additionalHeaders.replace(name, values) } - fun putHeaders(name: String, values: Iterable) = apply { - this.additionalHeaders.getOrPut(name) { mutableListOf() }.addAll(values) + fun replaceAllAdditionalHeaders(additionalHeaders: Headers) = apply { + this.additionalHeaders.replaceAll(additionalHeaders) } - fun putAllHeaders(additionalHeaders: Map>) = apply { - additionalHeaders.forEach(this::putHeaders) + fun replaceAllAdditionalHeaders(additionalHeaders: Map>) = apply { + this.additionalHeaders.replaceAll(additionalHeaders) } - fun removeHeader(name: String) = apply { this.additionalHeaders.put(name, mutableListOf()) } + fun removeAdditionalHeaders(name: String) = apply { additionalHeaders.remove(name) } + + fun removeAllAdditionalHeaders(names: Set) = apply { + additionalHeaders.removeAll(names) + } + + fun additionalQueryParams(additionalQueryParams: QueryParams) = apply { + this.additionalQueryParams.clear() + putAllAdditionalQueryParams(additionalQueryParams) + } + + fun additionalQueryParams(additionalQueryParams: Map>) = apply { + this.additionalQueryParams.clear() + putAllAdditionalQueryParams(additionalQueryParams) + } + + fun putAdditionalQueryParam(key: String, value: String) = apply { + additionalQueryParams.put(key, value) + } + + fun putAdditionalQueryParams(key: String, values: Iterable) = apply { + additionalQueryParams.put(key, values) + } + + fun putAllAdditionalQueryParams(additionalQueryParams: QueryParams) = apply { + this.additionalQueryParams.putAll(additionalQueryParams) + } + + fun putAllAdditionalQueryParams(additionalQueryParams: Map>) = + apply { + this.additionalQueryParams.putAll(additionalQueryParams) + } + + fun replaceAdditionalQueryParams(key: String, value: String) = apply { + additionalQueryParams.replace(key, value) + } + + fun replaceAdditionalQueryParams(key: String, values: Iterable) = apply { + additionalQueryParams.replace(key, values) + } + + fun replaceAllAdditionalQueryParams(additionalQueryParams: QueryParams) = apply { + this.additionalQueryParams.replaceAll(additionalQueryParams) + } + + fun replaceAllAdditionalQueryParams(additionalQueryParams: Map>) = + apply { + this.additionalQueryParams.replaceAll(additionalQueryParams) + } + + fun removeAdditionalQueryParams(key: String) = apply { additionalQueryParams.remove(key) } + + fun removeAllAdditionalQueryParams(keys: Set) = apply { + additionalQueryParams.removeAll(keys) + } fun build(): InferencePipelineRetrieveParams = InferencePipelineRetrieveParams( checkNotNull(inferencePipelineId) { "`inferencePipelineId` is required but was not set" }, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), + additionalHeaders.build(), + additionalQueryParams.build(), ) } } diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/InferencePipelineRetrieveResponse.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/InferencePipelineRetrieveResponse.kt index 95ec229..a500b3a 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/InferencePipelineRetrieveResponse.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/InferencePipelineRetrieveResponse.kt @@ -13,7 +13,7 @@ import com.openlayer.api.core.JsonField import com.openlayer.api.core.JsonMissing import com.openlayer.api.core.JsonValue import com.openlayer.api.core.NoAutoDetect -import com.openlayer.api.core.toUnmodifiable +import com.openlayer.api.core.toImmutable import com.openlayer.api.errors.OpenlayerInvalidDataException import java.time.OffsetDateTime import java.util.Objects @@ -43,8 +43,6 @@ private constructor( private var validated: Boolean = false - private var hashCode: Int = 0 - /** The inference pipeline id. */ fun id(): String = id.getRequired("id") @@ -169,58 +167,6 @@ private constructor( fun toBuilder() = Builder().from(this) - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return other is InferencePipelineRetrieveResponse && - this.id == other.id && - this.projectId == other.projectId && - this.name == other.name && - this.dateCreated == other.dateCreated && - this.dateUpdated == other.dateUpdated && - this.dateLastSampleReceived == other.dateLastSampleReceived && - this.description == other.description && - this.dateLastEvaluated == other.dateLastEvaluated && - this.dateOfNextEvaluation == other.dateOfNextEvaluation && - this.passingGoalCount == other.passingGoalCount && - this.failingGoalCount == other.failingGoalCount && - this.totalGoalCount == other.totalGoalCount && - this.status == other.status && - this.statusMessage == other.statusMessage && - this.links == other.links && - this.additionalProperties == other.additionalProperties - } - - override fun hashCode(): Int { - if (hashCode == 0) { - hashCode = - Objects.hash( - id, - projectId, - name, - dateCreated, - dateUpdated, - dateLastSampleReceived, - description, - dateLastEvaluated, - dateOfNextEvaluation, - passingGoalCount, - failingGoalCount, - totalGoalCount, - status, - statusMessage, - links, - additionalProperties, - ) - } - return hashCode - } - - override fun toString() = - "InferencePipelineRetrieveResponse{id=$id, projectId=$projectId, name=$name, dateCreated=$dateCreated, dateUpdated=$dateUpdated, dateLastSampleReceived=$dateLastSampleReceived, description=$description, dateLastEvaluated=$dateLastEvaluated, dateOfNextEvaluation=$dateOfNextEvaluation, passingGoalCount=$passingGoalCount, failingGoalCount=$failingGoalCount, totalGoalCount=$totalGoalCount, status=$status, statusMessage=$statusMessage, links=$links, additionalProperties=$additionalProperties}" - companion object { @JvmStatic fun builder() = Builder() @@ -437,7 +383,7 @@ private constructor( status, statusMessage, links, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -451,8 +397,6 @@ private constructor( private var validated: Boolean = false - private var hashCode: Int = 0 - fun app(): String = app.getRequired("app") @JsonProperty("app") @ExcludeMissing fun _app() = app @@ -470,25 +414,6 @@ private constructor( fun toBuilder() = Builder().from(this) - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return other is Links && - this.app == other.app && - this.additionalProperties == other.additionalProperties - } - - override fun hashCode(): Int { - if (hashCode == 0) { - hashCode = Objects.hash(app, additionalProperties) - } - return hashCode - } - - override fun toString() = "Links{app=$app, additionalProperties=$additionalProperties}" - companion object { @JvmStatic fun builder() = Builder() @@ -525,8 +450,27 @@ private constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): Links = Links(app, additionalProperties.toUnmodifiable()) + fun build(): Links = Links(app, additionalProperties.toImmutable()) } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is Links && this.app == other.app && this.additionalProperties == other.additionalProperties /* spotless:on */ + } + + private var hashCode: Int = 0 + + override fun hashCode(): Int { + if (hashCode == 0) { + hashCode = /* spotless:off */ Objects.hash(app, additionalProperties) /* spotless:on */ + } + return hashCode + } + + override fun toString() = "Links{app=$app, additionalProperties=$additionalProperties}" } class Status @@ -542,7 +486,7 @@ private constructor( return true } - return other is Status && this.value == other.value + return /* spotless:off */ other is Status && this.value == other.value /* spotless:on */ } override fun hashCode() = value.hashCode() @@ -609,4 +553,24 @@ private constructor( fun asString(): String = _value().asStringOrThrow() } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is InferencePipelineRetrieveResponse && this.id == other.id && this.projectId == other.projectId && this.name == other.name && this.dateCreated == other.dateCreated && this.dateUpdated == other.dateUpdated && this.dateLastSampleReceived == other.dateLastSampleReceived && this.description == other.description && this.dateLastEvaluated == other.dateLastEvaluated && this.dateOfNextEvaluation == other.dateOfNextEvaluation && this.passingGoalCount == other.passingGoalCount && this.failingGoalCount == other.failingGoalCount && this.totalGoalCount == other.totalGoalCount && this.status == other.status && this.statusMessage == other.statusMessage && this.links == other.links && this.additionalProperties == other.additionalProperties /* spotless:on */ + } + + private var hashCode: Int = 0 + + override fun hashCode(): Int { + if (hashCode == 0) { + hashCode = /* spotless:off */ Objects.hash(id, projectId, name, dateCreated, dateUpdated, dateLastSampleReceived, description, dateLastEvaluated, dateOfNextEvaluation, passingGoalCount, failingGoalCount, totalGoalCount, status, statusMessage, links, additionalProperties) /* spotless:on */ + } + return hashCode + } + + override fun toString() = + "InferencePipelineRetrieveResponse{id=$id, projectId=$projectId, name=$name, dateCreated=$dateCreated, dateUpdated=$dateUpdated, dateLastSampleReceived=$dateLastSampleReceived, description=$description, dateLastEvaluated=$dateLastEvaluated, dateOfNextEvaluation=$dateOfNextEvaluation, passingGoalCount=$passingGoalCount, failingGoalCount=$failingGoalCount, totalGoalCount=$totalGoalCount, status=$status, statusMessage=$statusMessage, links=$links, additionalProperties=$additionalProperties}" } diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/InferencePipelineRowUpdateParams.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/InferencePipelineRowUpdateParams.kt index a8072f9..7062d0b 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/InferencePipelineRowUpdateParams.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/InferencePipelineRowUpdateParams.kt @@ -9,7 +9,9 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize import com.openlayer.api.core.ExcludeMissing import com.openlayer.api.core.JsonValue import com.openlayer.api.core.NoAutoDetect -import com.openlayer.api.core.toUnmodifiable +import com.openlayer.api.core.http.Headers +import com.openlayer.api.core.http.QueryParams +import com.openlayer.api.core.toImmutable import com.openlayer.api.models.* import java.util.Objects import java.util.Optional @@ -20,8 +22,8 @@ constructor( private val inferenceId: String, private val row: JsonValue, private val config: Config?, - private val additionalQueryParams: Map>, - private val additionalHeaders: Map>, + private val additionalHeaders: Headers, + private val additionalQueryParams: QueryParams, private val additionalBodyProperties: Map, ) { @@ -42,16 +44,16 @@ constructor( ) } + @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + @JvmSynthetic - internal fun getQueryParams(): Map> { - val params = mutableMapOf>() - this.inferenceId.let { params.put("inferenceId", listOf(it.toString())) } - params.putAll(additionalQueryParams) - return params.toUnmodifiable() + internal fun getQueryParams(): QueryParams { + val queryParams = QueryParams.builder() + this.inferenceId.let { queryParams.put("inferenceId", listOf(it.toString())) } + queryParams.putAll(additionalQueryParams) + return queryParams.build() } - @JvmSynthetic internal fun getHeaders(): Map> = additionalHeaders - fun getPathParam(index: Int): String { return when (index) { 0 -> inferencePipelineId @@ -68,8 +70,6 @@ constructor( private val additionalProperties: Map, ) { - private var hashCode: Int = 0 - @JsonProperty("row") fun row(): JsonValue? = row @JsonProperty("config") fun config(): Config? = config @@ -80,32 +80,6 @@ constructor( fun toBuilder() = Builder().from(this) - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return other is InferencePipelineRowUpdateBody && - this.row == other.row && - this.config == other.config && - this.additionalProperties == other.additionalProperties - } - - override fun hashCode(): Int { - if (hashCode == 0) { - hashCode = - Objects.hash( - row, - config, - additionalProperties, - ) - } - return hashCode - } - - override fun toString() = - "InferencePipelineRowUpdateBody{row=$row, config=$config, additionalProperties=$additionalProperties}" - companion object { @JvmStatic fun builder() = Builder() @@ -147,14 +121,34 @@ constructor( InferencePipelineRowUpdateBody( checkNotNull(row) { "`row` is required but was not set" }, config, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is InferencePipelineRowUpdateBody && this.row == other.row && this.config == other.config && this.additionalProperties == other.additionalProperties /* spotless:on */ + } + + private var hashCode: Int = 0 + + override fun hashCode(): Int { + if (hashCode == 0) { + hashCode = /* spotless:off */ Objects.hash(row, config, additionalProperties) /* spotless:on */ + } + return hashCode + } + + override fun toString() = + "InferencePipelineRowUpdateBody{row=$row, config=$config, additionalProperties=$additionalProperties}" } - fun _additionalQueryParams(): Map> = additionalQueryParams + fun _additionalHeaders(): Headers = additionalHeaders - fun _additionalHeaders(): Map> = additionalHeaders + fun _additionalQueryParams(): QueryParams = additionalQueryParams fun _additionalBodyProperties(): Map = additionalBodyProperties @@ -163,30 +157,15 @@ constructor( return true } - return other is InferencePipelineRowUpdateParams && - this.inferencePipelineId == other.inferencePipelineId && - this.row == other.row && - this.config == other.config && - this.inferenceId == other.inferenceId && - this.additionalQueryParams == other.additionalQueryParams && - this.additionalHeaders == other.additionalHeaders && - this.additionalBodyProperties == other.additionalBodyProperties + return /* spotless:off */ other is InferencePipelineRowUpdateParams && this.inferencePipelineId == other.inferencePipelineId && this.row == other.row && this.config == other.config && this.inferenceId == other.inferenceId && this.additionalHeaders == other.additionalHeaders && this.additionalQueryParams == other.additionalQueryParams && this.additionalBodyProperties == other.additionalBodyProperties /* spotless:on */ } override fun hashCode(): Int { - return Objects.hash( - inferencePipelineId, - row, - config, - inferenceId, - additionalQueryParams, - additionalHeaders, - additionalBodyProperties, - ) + return /* spotless:off */ Objects.hash(inferencePipelineId, row, config, inferenceId, additionalHeaders, additionalQueryParams, additionalBodyProperties) /* spotless:on */ } override fun toString() = - "InferencePipelineRowUpdateParams{inferencePipelineId=$inferencePipelineId, row=$row, config=$config, inferenceId=$inferenceId, additionalQueryParams=$additionalQueryParams, additionalHeaders=$additionalHeaders, additionalBodyProperties=$additionalBodyProperties}" + "InferencePipelineRowUpdateParams{inferencePipelineId=$inferencePipelineId, row=$row, config=$config, inferenceId=$inferenceId, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams, additionalBodyProperties=$additionalBodyProperties}" fun toBuilder() = Builder().from(this) @@ -202,8 +181,8 @@ constructor( private var inferenceId: String? = null private var row: JsonValue? = null private var config: Config? = null - private var additionalQueryParams: MutableMap> = mutableMapOf() - private var additionalHeaders: MutableMap> = mutableMapOf() + private var additionalHeaders: Headers.Builder = Headers.builder() + private var additionalQueryParams: QueryParams.Builder = QueryParams.builder() private var additionalBodyProperties: MutableMap = mutableMapOf() @JvmSynthetic @@ -213,8 +192,8 @@ constructor( this.inferenceId = inferencePipelineRowUpdateParams.inferenceId this.row = inferencePipelineRowUpdateParams.row this.config = inferencePipelineRowUpdateParams.config - additionalQueryParams(inferencePipelineRowUpdateParams.additionalQueryParams) additionalHeaders(inferencePipelineRowUpdateParams.additionalHeaders) + additionalQueryParams(inferencePipelineRowUpdateParams.additionalQueryParams) additionalBodyProperties(inferencePipelineRowUpdateParams.additionalBodyProperties) } @@ -229,53 +208,111 @@ constructor( fun config(config: Config) = apply { this.config = config } - fun additionalQueryParams(additionalQueryParams: Map>) = apply { - this.additionalQueryParams.clear() - putAllQueryParams(additionalQueryParams) + fun additionalHeaders(additionalHeaders: Headers) = apply { + this.additionalHeaders.clear() + putAllAdditionalHeaders(additionalHeaders) } - fun putQueryParam(name: String, value: String) = apply { - this.additionalQueryParams.getOrPut(name) { mutableListOf() }.add(value) + fun additionalHeaders(additionalHeaders: Map>) = apply { + this.additionalHeaders.clear() + putAllAdditionalHeaders(additionalHeaders) } - fun putQueryParams(name: String, values: Iterable) = apply { - this.additionalQueryParams.getOrPut(name) { mutableListOf() }.addAll(values) + fun putAdditionalHeader(name: String, value: String) = apply { + additionalHeaders.put(name, value) } - fun putAllQueryParams(additionalQueryParams: Map>) = apply { - additionalQueryParams.forEach(this::putQueryParams) + fun putAdditionalHeaders(name: String, values: Iterable) = apply { + additionalHeaders.put(name, values) } - fun removeQueryParam(name: String) = apply { - this.additionalQueryParams.put(name, mutableListOf()) + fun putAllAdditionalHeaders(additionalHeaders: Headers) = apply { + this.additionalHeaders.putAll(additionalHeaders) } - fun additionalHeaders(additionalHeaders: Map>) = apply { - this.additionalHeaders.clear() - putAllHeaders(additionalHeaders) + fun putAllAdditionalHeaders(additionalHeaders: Map>) = apply { + this.additionalHeaders.putAll(additionalHeaders) } - fun putHeader(name: String, value: String) = apply { - this.additionalHeaders.getOrPut(name) { mutableListOf() }.add(value) + fun replaceAdditionalHeaders(name: String, value: String) = apply { + additionalHeaders.replace(name, value) } - fun putHeaders(name: String, values: Iterable) = apply { - this.additionalHeaders.getOrPut(name) { mutableListOf() }.addAll(values) + fun replaceAdditionalHeaders(name: String, values: Iterable) = apply { + additionalHeaders.replace(name, values) } - fun putAllHeaders(additionalHeaders: Map>) = apply { - additionalHeaders.forEach(this::putHeaders) + fun replaceAllAdditionalHeaders(additionalHeaders: Headers) = apply { + this.additionalHeaders.replaceAll(additionalHeaders) } - fun removeHeader(name: String) = apply { this.additionalHeaders.put(name, mutableListOf()) } + fun replaceAllAdditionalHeaders(additionalHeaders: Map>) = apply { + this.additionalHeaders.replaceAll(additionalHeaders) + } + + fun removeAdditionalHeaders(name: String) = apply { additionalHeaders.remove(name) } + + fun removeAllAdditionalHeaders(names: Set) = apply { + additionalHeaders.removeAll(names) + } + + fun additionalQueryParams(additionalQueryParams: QueryParams) = apply { + this.additionalQueryParams.clear() + putAllAdditionalQueryParams(additionalQueryParams) + } + + fun additionalQueryParams(additionalQueryParams: Map>) = apply { + this.additionalQueryParams.clear() + putAllAdditionalQueryParams(additionalQueryParams) + } + + fun putAdditionalQueryParam(key: String, value: String) = apply { + additionalQueryParams.put(key, value) + } + + fun putAdditionalQueryParams(key: String, values: Iterable) = apply { + additionalQueryParams.put(key, values) + } + + fun putAllAdditionalQueryParams(additionalQueryParams: QueryParams) = apply { + this.additionalQueryParams.putAll(additionalQueryParams) + } + + fun putAllAdditionalQueryParams(additionalQueryParams: Map>) = + apply { + this.additionalQueryParams.putAll(additionalQueryParams) + } + + fun replaceAdditionalQueryParams(key: String, value: String) = apply { + additionalQueryParams.replace(key, value) + } + + fun replaceAdditionalQueryParams(key: String, values: Iterable) = apply { + additionalQueryParams.replace(key, values) + } + + fun replaceAllAdditionalQueryParams(additionalQueryParams: QueryParams) = apply { + this.additionalQueryParams.replaceAll(additionalQueryParams) + } + + fun replaceAllAdditionalQueryParams(additionalQueryParams: Map>) = + apply { + this.additionalQueryParams.replaceAll(additionalQueryParams) + } + + fun removeAdditionalQueryParams(key: String) = apply { additionalQueryParams.remove(key) } + + fun removeAllAdditionalQueryParams(keys: Set) = apply { + additionalQueryParams.removeAll(keys) + } fun additionalBodyProperties(additionalBodyProperties: Map) = apply { this.additionalBodyProperties.clear() - this.additionalBodyProperties.putAll(additionalBodyProperties) + putAllAdditionalBodyProperties(additionalBodyProperties) } fun putAdditionalBodyProperty(key: String, value: JsonValue) = apply { - this.additionalBodyProperties.put(key, value) + additionalBodyProperties.put(key, value) } fun putAllAdditionalBodyProperties(additionalBodyProperties: Map) = @@ -283,6 +320,14 @@ constructor( this.additionalBodyProperties.putAll(additionalBodyProperties) } + fun removeAdditionalBodyProperty(key: String) = apply { + additionalBodyProperties.remove(key) + } + + fun removeAllAdditionalBodyProperties(keys: Set) = apply { + keys.forEach(::removeAdditionalBodyProperty) + } + fun build(): InferencePipelineRowUpdateParams = InferencePipelineRowUpdateParams( checkNotNull(inferencePipelineId) { @@ -291,9 +336,9 @@ constructor( checkNotNull(inferenceId) { "`inferenceId` is required but was not set" }, checkNotNull(row) { "`row` is required but was not set" }, config, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + additionalHeaders.build(), + additionalQueryParams.build(), + additionalBodyProperties.toImmutable(), ) } @@ -309,8 +354,6 @@ constructor( private val additionalProperties: Map, ) { - private var hashCode: Int = 0 - /** * Name of the column with the inference ids. This is useful if you want to update rows at a * later point in time. If not provided, a unique id is generated by Openlayer. @@ -342,38 +385,6 @@ constructor( fun toBuilder() = Builder().from(this) - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return other is Config && - this.inferenceIdColumnName == other.inferenceIdColumnName && - this.latencyColumnName == other.latencyColumnName && - this.timestampColumnName == other.timestampColumnName && - this.groundTruthColumnName == other.groundTruthColumnName && - this.humanFeedbackColumnName == other.humanFeedbackColumnName && - this.additionalProperties == other.additionalProperties - } - - override fun hashCode(): Int { - if (hashCode == 0) { - hashCode = - Objects.hash( - inferenceIdColumnName, - latencyColumnName, - timestampColumnName, - groundTruthColumnName, - humanFeedbackColumnName, - additionalProperties, - ) - } - return hashCode - } - - override fun toString() = - "Config{inferenceIdColumnName=$inferenceIdColumnName, latencyColumnName=$latencyColumnName, timestampColumnName=$timestampColumnName, groundTruthColumnName=$groundTruthColumnName, humanFeedbackColumnName=$humanFeedbackColumnName, additionalProperties=$additionalProperties}" - companion object { @JvmStatic fun builder() = Builder() @@ -455,8 +466,28 @@ constructor( timestampColumnName, groundTruthColumnName, humanFeedbackColumnName, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is Config && this.inferenceIdColumnName == other.inferenceIdColumnName && this.latencyColumnName == other.latencyColumnName && this.timestampColumnName == other.timestampColumnName && this.groundTruthColumnName == other.groundTruthColumnName && this.humanFeedbackColumnName == other.humanFeedbackColumnName && this.additionalProperties == other.additionalProperties /* spotless:on */ + } + + private var hashCode: Int = 0 + + override fun hashCode(): Int { + if (hashCode == 0) { + hashCode = /* spotless:off */ Objects.hash(inferenceIdColumnName, latencyColumnName, timestampColumnName, groundTruthColumnName, humanFeedbackColumnName, additionalProperties) /* spotless:on */ + } + return hashCode + } + + override fun toString() = + "Config{inferenceIdColumnName=$inferenceIdColumnName, latencyColumnName=$latencyColumnName, timestampColumnName=$timestampColumnName, groundTruthColumnName=$groundTruthColumnName, humanFeedbackColumnName=$humanFeedbackColumnName, additionalProperties=$additionalProperties}" } } diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/InferencePipelineRowUpdateResponse.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/InferencePipelineRowUpdateResponse.kt index 35e877e..595d237 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/InferencePipelineRowUpdateResponse.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/InferencePipelineRowUpdateResponse.kt @@ -13,7 +13,7 @@ import com.openlayer.api.core.JsonField import com.openlayer.api.core.JsonMissing import com.openlayer.api.core.JsonValue import com.openlayer.api.core.NoAutoDetect -import com.openlayer.api.core.toUnmodifiable +import com.openlayer.api.core.toImmutable import com.openlayer.api.errors.OpenlayerInvalidDataException import java.util.Objects @@ -27,8 +27,6 @@ private constructor( private var validated: Boolean = false - private var hashCode: Int = 0 - fun success(): Success = success.getRequired("success") @JsonProperty("success") @ExcludeMissing fun _success() = success @@ -46,26 +44,6 @@ private constructor( fun toBuilder() = Builder().from(this) - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return other is InferencePipelineRowUpdateResponse && - this.success == other.success && - this.additionalProperties == other.additionalProperties - } - - override fun hashCode(): Int { - if (hashCode == 0) { - hashCode = Objects.hash(success, additionalProperties) - } - return hashCode - } - - override fun toString() = - "InferencePipelineRowUpdateResponse{success=$success, additionalProperties=$additionalProperties}" - companion object { @JvmStatic fun builder() = Builder() @@ -104,7 +82,7 @@ private constructor( } fun build(): InferencePipelineRowUpdateResponse = - InferencePipelineRowUpdateResponse(success, additionalProperties.toUnmodifiable()) + InferencePipelineRowUpdateResponse(success, additionalProperties.toImmutable()) } class Success @@ -120,7 +98,7 @@ private constructor( return true } - return other is Success && this.value == other.value + return /* spotless:off */ other is Success && this.value == other.value /* spotless:on */ } override fun hashCode() = value.hashCode() @@ -157,4 +135,24 @@ private constructor( fun asString(): String = _value().asStringOrThrow() } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is InferencePipelineRowUpdateResponse && this.success == other.success && this.additionalProperties == other.additionalProperties /* spotless:on */ + } + + private var hashCode: Int = 0 + + override fun hashCode(): Int { + if (hashCode == 0) { + hashCode = /* spotless:off */ Objects.hash(success, additionalProperties) /* spotless:on */ + } + return hashCode + } + + override fun toString() = + "InferencePipelineRowUpdateResponse{success=$success, additionalProperties=$additionalProperties}" } diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/InferencePipelineTestResultListParams.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/InferencePipelineTestResultListParams.kt index f7ca906..183f81f 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/InferencePipelineTestResultListParams.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/InferencePipelineTestResultListParams.kt @@ -7,7 +7,8 @@ import com.openlayer.api.core.Enum import com.openlayer.api.core.JsonField import com.openlayer.api.core.JsonValue import com.openlayer.api.core.NoAutoDetect -import com.openlayer.api.core.toUnmodifiable +import com.openlayer.api.core.http.Headers +import com.openlayer.api.core.http.QueryParams import com.openlayer.api.errors.OpenlayerInvalidDataException import com.openlayer.api.models.* import java.util.Objects @@ -20,8 +21,8 @@ constructor( private val perPage: Long?, private val status: Status?, private val type: Type?, - private val additionalQueryParams: Map>, - private val additionalHeaders: Map>, + private val additionalHeaders: Headers, + private val additionalQueryParams: QueryParams, ) { fun inferencePipelineId(): String = inferencePipelineId @@ -34,19 +35,19 @@ constructor( fun type(): Optional = Optional.ofNullable(type) + @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + @JvmSynthetic - internal fun getQueryParams(): Map> { - val params = mutableMapOf>() - this.page?.let { params.put("page", listOf(it.toString())) } - this.perPage?.let { params.put("perPage", listOf(it.toString())) } - this.status?.let { params.put("status", listOf(it.toString())) } - this.type?.let { params.put("type", listOf(it.toString())) } - params.putAll(additionalQueryParams) - return params.toUnmodifiable() + internal fun getQueryParams(): QueryParams { + val queryParams = QueryParams.builder() + this.page?.let { queryParams.put("page", listOf(it.toString())) } + this.perPage?.let { queryParams.put("perPage", listOf(it.toString())) } + this.status?.let { queryParams.put("status", listOf(it.toString())) } + this.type?.let { queryParams.put("type", listOf(it.toString())) } + queryParams.putAll(additionalQueryParams) + return queryParams.build() } - @JvmSynthetic internal fun getHeaders(): Map> = additionalHeaders - fun getPathParam(index: Int): String { return when (index) { 0 -> inferencePipelineId @@ -54,39 +55,24 @@ constructor( } } - fun _additionalQueryParams(): Map> = additionalQueryParams + fun _additionalHeaders(): Headers = additionalHeaders - fun _additionalHeaders(): Map> = additionalHeaders + fun _additionalQueryParams(): QueryParams = additionalQueryParams override fun equals(other: Any?): Boolean { if (this === other) { return true } - return other is InferencePipelineTestResultListParams && - this.inferencePipelineId == other.inferencePipelineId && - this.page == other.page && - this.perPage == other.perPage && - this.status == other.status && - this.type == other.type && - this.additionalQueryParams == other.additionalQueryParams && - this.additionalHeaders == other.additionalHeaders + return /* spotless:off */ other is InferencePipelineTestResultListParams && this.inferencePipelineId == other.inferencePipelineId && this.page == other.page && this.perPage == other.perPage && this.status == other.status && this.type == other.type && this.additionalHeaders == other.additionalHeaders && this.additionalQueryParams == other.additionalQueryParams /* spotless:on */ } override fun hashCode(): Int { - return Objects.hash( - inferencePipelineId, - page, - perPage, - status, - type, - additionalQueryParams, - additionalHeaders, - ) + return /* spotless:off */ Objects.hash(inferencePipelineId, page, perPage, status, type, additionalHeaders, additionalQueryParams) /* spotless:on */ } override fun toString() = - "InferencePipelineTestResultListParams{inferencePipelineId=$inferencePipelineId, page=$page, perPage=$perPage, status=$status, type=$type, additionalQueryParams=$additionalQueryParams, additionalHeaders=$additionalHeaders}" + "InferencePipelineTestResultListParams{inferencePipelineId=$inferencePipelineId, page=$page, perPage=$perPage, status=$status, type=$type, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams}" fun toBuilder() = Builder().from(this) @@ -103,8 +89,8 @@ constructor( private var perPage: Long? = null private var status: Status? = null private var type: Type? = null - private var additionalQueryParams: MutableMap> = mutableMapOf() - private var additionalHeaders: MutableMap> = mutableMapOf() + private var additionalHeaders: Headers.Builder = Headers.builder() + private var additionalQueryParams: QueryParams.Builder = QueryParams.builder() @JvmSynthetic internal fun from( @@ -115,8 +101,8 @@ constructor( this.perPage = inferencePipelineTestResultListParams.perPage this.status = inferencePipelineTestResultListParams.status this.type = inferencePipelineTestResultListParams.type - additionalQueryParams(inferencePipelineTestResultListParams.additionalQueryParams) additionalHeaders(inferencePipelineTestResultListParams.additionalHeaders) + additionalQueryParams(inferencePipelineTestResultListParams.additionalQueryParams) } fun inferencePipelineId(inferencePipelineId: String) = apply { @@ -141,45 +127,103 @@ constructor( */ fun type(type: Type) = apply { this.type = type } - fun additionalQueryParams(additionalQueryParams: Map>) = apply { - this.additionalQueryParams.clear() - putAllQueryParams(additionalQueryParams) + fun additionalHeaders(additionalHeaders: Headers) = apply { + this.additionalHeaders.clear() + putAllAdditionalHeaders(additionalHeaders) } - fun putQueryParam(name: String, value: String) = apply { - this.additionalQueryParams.getOrPut(name) { mutableListOf() }.add(value) + fun additionalHeaders(additionalHeaders: Map>) = apply { + this.additionalHeaders.clear() + putAllAdditionalHeaders(additionalHeaders) } - fun putQueryParams(name: String, values: Iterable) = apply { - this.additionalQueryParams.getOrPut(name) { mutableListOf() }.addAll(values) + fun putAdditionalHeader(name: String, value: String) = apply { + additionalHeaders.put(name, value) } - fun putAllQueryParams(additionalQueryParams: Map>) = apply { - additionalQueryParams.forEach(this::putQueryParams) + fun putAdditionalHeaders(name: String, values: Iterable) = apply { + additionalHeaders.put(name, values) } - fun removeQueryParam(name: String) = apply { - this.additionalQueryParams.put(name, mutableListOf()) + fun putAllAdditionalHeaders(additionalHeaders: Headers) = apply { + this.additionalHeaders.putAll(additionalHeaders) } - fun additionalHeaders(additionalHeaders: Map>) = apply { - this.additionalHeaders.clear() - putAllHeaders(additionalHeaders) + fun putAllAdditionalHeaders(additionalHeaders: Map>) = apply { + this.additionalHeaders.putAll(additionalHeaders) } - fun putHeader(name: String, value: String) = apply { - this.additionalHeaders.getOrPut(name) { mutableListOf() }.add(value) + fun replaceAdditionalHeaders(name: String, value: String) = apply { + additionalHeaders.replace(name, value) } - fun putHeaders(name: String, values: Iterable) = apply { - this.additionalHeaders.getOrPut(name) { mutableListOf() }.addAll(values) + fun replaceAdditionalHeaders(name: String, values: Iterable) = apply { + additionalHeaders.replace(name, values) } - fun putAllHeaders(additionalHeaders: Map>) = apply { - additionalHeaders.forEach(this::putHeaders) + fun replaceAllAdditionalHeaders(additionalHeaders: Headers) = apply { + this.additionalHeaders.replaceAll(additionalHeaders) } - fun removeHeader(name: String) = apply { this.additionalHeaders.put(name, mutableListOf()) } + fun replaceAllAdditionalHeaders(additionalHeaders: Map>) = apply { + this.additionalHeaders.replaceAll(additionalHeaders) + } + + fun removeAdditionalHeaders(name: String) = apply { additionalHeaders.remove(name) } + + fun removeAllAdditionalHeaders(names: Set) = apply { + additionalHeaders.removeAll(names) + } + + fun additionalQueryParams(additionalQueryParams: QueryParams) = apply { + this.additionalQueryParams.clear() + putAllAdditionalQueryParams(additionalQueryParams) + } + + fun additionalQueryParams(additionalQueryParams: Map>) = apply { + this.additionalQueryParams.clear() + putAllAdditionalQueryParams(additionalQueryParams) + } + + fun putAdditionalQueryParam(key: String, value: String) = apply { + additionalQueryParams.put(key, value) + } + + fun putAdditionalQueryParams(key: String, values: Iterable) = apply { + additionalQueryParams.put(key, values) + } + + fun putAllAdditionalQueryParams(additionalQueryParams: QueryParams) = apply { + this.additionalQueryParams.putAll(additionalQueryParams) + } + + fun putAllAdditionalQueryParams(additionalQueryParams: Map>) = + apply { + this.additionalQueryParams.putAll(additionalQueryParams) + } + + fun replaceAdditionalQueryParams(key: String, value: String) = apply { + additionalQueryParams.replace(key, value) + } + + fun replaceAdditionalQueryParams(key: String, values: Iterable) = apply { + additionalQueryParams.replace(key, values) + } + + fun replaceAllAdditionalQueryParams(additionalQueryParams: QueryParams) = apply { + this.additionalQueryParams.replaceAll(additionalQueryParams) + } + + fun replaceAllAdditionalQueryParams(additionalQueryParams: Map>) = + apply { + this.additionalQueryParams.replaceAll(additionalQueryParams) + } + + fun removeAdditionalQueryParams(key: String) = apply { additionalQueryParams.remove(key) } + + fun removeAllAdditionalQueryParams(keys: Set) = apply { + additionalQueryParams.removeAll(keys) + } fun build(): InferencePipelineTestResultListParams = InferencePipelineTestResultListParams( @@ -190,8 +234,8 @@ constructor( perPage, status, type, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), + additionalHeaders.build(), + additionalQueryParams.build(), ) } @@ -208,7 +252,7 @@ constructor( return true } - return other is Status && this.value == other.value + return /* spotless:off */ other is Status && this.value == other.value /* spotless:on */ } override fun hashCode() = value.hashCode() @@ -283,7 +327,7 @@ constructor( return true } - return other is Type && this.value == other.value + return /* spotless:off */ other is Type && this.value == other.value /* spotless:on */ } override fun hashCode() = value.hashCode() diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/InferencePipelineTestResultListResponse.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/InferencePipelineTestResultListResponse.kt index 06f8ed6..0078c11 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/InferencePipelineTestResultListResponse.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/InferencePipelineTestResultListResponse.kt @@ -22,7 +22,7 @@ import com.openlayer.api.core.JsonMissing import com.openlayer.api.core.JsonValue import com.openlayer.api.core.NoAutoDetect import com.openlayer.api.core.getOrThrow -import com.openlayer.api.core.toUnmodifiable +import com.openlayer.api.core.toImmutable import com.openlayer.api.errors.OpenlayerInvalidDataException import java.time.OffsetDateTime import java.util.Objects @@ -38,8 +38,6 @@ private constructor( private var validated: Boolean = false - private var hashCode: Int = 0 - fun items(): List = items.getRequired("items") @JsonProperty("items") @ExcludeMissing fun _items() = items @@ -57,26 +55,6 @@ private constructor( fun toBuilder() = Builder().from(this) - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return other is InferencePipelineTestResultListResponse && - this.items == other.items && - this.additionalProperties == other.additionalProperties - } - - override fun hashCode(): Int { - if (hashCode == 0) { - hashCode = Objects.hash(items, additionalProperties) - } - return hashCode - } - - override fun toString() = - "InferencePipelineTestResultListResponse{items=$items, additionalProperties=$additionalProperties}" - companion object { @JvmStatic fun builder() = Builder() @@ -117,8 +95,8 @@ private constructor( fun build(): InferencePipelineTestResultListResponse = InferencePipelineTestResultListResponse( - items.map { it.toUnmodifiable() }, - additionalProperties.toUnmodifiable() + items.map { it.toImmutable() }, + additionalProperties.toImmutable() ) } @@ -142,8 +120,6 @@ private constructor( private var validated: Boolean = false - private var hashCode: Int = 0 - /** Project version (commit) id. */ fun id(): String = id.getRequired("id") @@ -238,50 +214,6 @@ private constructor( fun toBuilder() = Builder().from(this) - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return other is Item && - this.id == other.id && - this.goal == other.goal && - this.goalId == other.goalId && - this.projectVersionId == other.projectVersionId && - this.inferencePipelineId == other.inferencePipelineId && - this.dateCreated == other.dateCreated && - this.dateUpdated == other.dateUpdated && - this.dateDataStarts == other.dateDataStarts && - this.dateDataEnds == other.dateDataEnds && - this.status == other.status && - this.statusMessage == other.statusMessage && - this.additionalProperties == other.additionalProperties - } - - override fun hashCode(): Int { - if (hashCode == 0) { - hashCode = - Objects.hash( - id, - goal, - goalId, - projectVersionId, - inferencePipelineId, - dateCreated, - dateUpdated, - dateDataStarts, - dateDataEnds, - status, - statusMessage, - additionalProperties, - ) - } - return hashCode - } - - override fun toString() = - "Item{id=$id, goal=$goal, goalId=$goalId, projectVersionId=$projectVersionId, inferencePipelineId=$inferencePipelineId, dateCreated=$dateCreated, dateUpdated=$dateUpdated, dateDataStarts=$dateDataStarts, dateDataEnds=$dateDataEnds, status=$status, statusMessage=$statusMessage, additionalProperties=$additionalProperties}" - companion object { @JvmStatic fun builder() = Builder() @@ -449,7 +381,7 @@ private constructor( dateDataEnds, status, statusMessage, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -466,7 +398,7 @@ private constructor( return true } - return other is Status && this.value == other.value + return /* spotless:off */ other is Status && this.value == other.value /* spotless:on */ } override fun hashCode() = value.hashCode() @@ -559,8 +491,6 @@ private constructor( private var validated: Boolean = false - private var hashCode: Int = 0 - /** The test id. */ fun id(): String = id.getRequired("id") @@ -744,72 +674,6 @@ private constructor( fun toBuilder() = Builder().from(this) - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return other is Goal && - this.id == other.id && - this.number == other.number && - this.name == other.name && - this.dateCreated == other.dateCreated && - this.dateUpdated == other.dateUpdated && - this.description == other.description && - this.evaluationWindow == other.evaluationWindow && - this.delayWindow == other.delayWindow && - this.type == other.type && - this.subtype == other.subtype && - this.creatorId == other.creatorId && - this.originProjectVersionId == other.originProjectVersionId && - this.thresholds == other.thresholds && - this.archived == other.archived && - this.dateArchived == other.dateArchived && - this.suggested == other.suggested && - this.commentCount == other.commentCount && - this.usesMlModel == other.usesMlModel && - this.usesValidationDataset == other.usesValidationDataset && - this.usesTrainingDataset == other.usesTrainingDataset && - this.usesReferenceDataset == other.usesReferenceDataset && - this.usesProductionData == other.usesProductionData && - this.additionalProperties == other.additionalProperties - } - - override fun hashCode(): Int { - if (hashCode == 0) { - hashCode = - Objects.hash( - id, - number, - name, - dateCreated, - dateUpdated, - description, - evaluationWindow, - delayWindow, - type, - subtype, - creatorId, - originProjectVersionId, - thresholds, - archived, - dateArchived, - suggested, - commentCount, - usesMlModel, - usesValidationDataset, - usesTrainingDataset, - usesReferenceDataset, - usesProductionData, - additionalProperties, - ) - } - return hashCode - } - - override fun toString() = - "Goal{id=$id, number=$number, name=$name, dateCreated=$dateCreated, dateUpdated=$dateUpdated, description=$description, evaluationWindow=$evaluationWindow, delayWindow=$delayWindow, type=$type, subtype=$subtype, creatorId=$creatorId, originProjectVersionId=$originProjectVersionId, thresholds=$thresholds, archived=$archived, dateArchived=$dateArchived, suggested=$suggested, commentCount=$commentCount, usesMlModel=$usesMlModel, usesValidationDataset=$usesValidationDataset, usesTrainingDataset=$usesTrainingDataset, usesReferenceDataset=$usesReferenceDataset, usesProductionData=$usesProductionData, additionalProperties=$additionalProperties}" - companion object { @JvmStatic fun builder() = Builder() @@ -1107,7 +971,7 @@ private constructor( subtype, creatorId, originProjectVersionId, - thresholds.map { it.toUnmodifiable() }, + thresholds.map { it.toImmutable() }, archived, dateArchived, suggested, @@ -1117,7 +981,7 @@ private constructor( usesTrainingDataset, usesReferenceDataset, usesProductionData, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -1135,8 +999,6 @@ private constructor( private var validated: Boolean = false - private var hashCode: Int = 0 - /** The measurement to be evaluated. */ fun measurement(): Optional = Optional.ofNullable(measurement.getNullable("measurement")) @@ -1188,38 +1050,6 @@ private constructor( fun toBuilder() = Builder().from(this) - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return other is Threshold && - this.measurement == other.measurement && - this.insightName == other.insightName && - this.insightParameters == other.insightParameters && - this.operator == other.operator && - this.value == other.value && - this.additionalProperties == other.additionalProperties - } - - override fun hashCode(): Int { - if (hashCode == 0) { - hashCode = - Objects.hash( - measurement, - insightName, - insightParameters, - operator, - value, - additionalProperties, - ) - } - return hashCode - } - - override fun toString() = - "Threshold{measurement=$measurement, insightName=$insightName, insightParameters=$insightParameters, operator=$operator, value=$value, additionalProperties=$additionalProperties}" - companion object { @JvmStatic fun builder() = Builder() @@ -1308,10 +1138,10 @@ private constructor( Threshold( measurement, insightName, - insightParameters.map { it.toUnmodifiable() }, + insightParameters.map { it.toImmutable() }, operator, value, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -1319,8 +1149,8 @@ private constructor( @JsonSerialize(using = Value.Serializer::class) class Value private constructor( - private val double: Double? = null, - private val boolean: Boolean? = null, + private val number: Double? = null, + private val bool: Boolean? = null, private val string: String? = null, private val strings: List? = null, private val _json: JsonValue? = null, @@ -1328,25 +1158,25 @@ private constructor( private var validated: Boolean = false - fun double(): Optional = Optional.ofNullable(double) + fun number(): Optional = Optional.ofNullable(number) - fun boolean(): Optional = Optional.ofNullable(boolean) + fun bool(): Optional = Optional.ofNullable(bool) fun string(): Optional = Optional.ofNullable(string) fun strings(): Optional> = Optional.ofNullable(strings) - fun isDouble(): Boolean = double != null + fun isNumber(): Boolean = number != null - fun isBoolean(): Boolean = boolean != null + fun isBool(): Boolean = bool != null fun isString(): Boolean = string != null fun isStrings(): Boolean = strings != null - fun asDouble(): Double = double.getOrThrow("double") + fun asNumber(): Double = number.getOrThrow("number") - fun asBoolean(): Boolean = boolean.getOrThrow("boolean") + fun asBool(): Boolean = bool.getOrThrow("bool") fun asString(): String = string.getOrThrow("string") @@ -1356,8 +1186,8 @@ private constructor( fun accept(visitor: Visitor): T { return when { - double != null -> visitor.visitDouble(double) - boolean != null -> visitor.visitBoolean(boolean) + number != null -> visitor.visitNumber(number) + bool != null -> visitor.visitBool(bool) string != null -> visitor.visitString(string) strings != null -> visitor.visitStrings(strings) else -> visitor.unknown(_json) @@ -1367,10 +1197,7 @@ private constructor( fun validate(): Value = apply { if (!validated) { if ( - double == null && - boolean == null && - string == null && - strings == null + number == null && bool == null && string == null && strings == null ) { throw OpenlayerInvalidDataException("Unknown Value: $_json") } @@ -1383,26 +1210,17 @@ private constructor( return true } - return other is Value && - this.double == other.double && - this.boolean == other.boolean && - this.string == other.string && - this.strings == other.strings + return /* spotless:off */ other is Value && this.number == other.number && this.bool == other.bool && this.string == other.string && this.strings == other.strings /* spotless:on */ } override fun hashCode(): Int { - return Objects.hash( - double, - boolean, - string, - strings, - ) + return /* spotless:off */ Objects.hash(number, bool, string, strings) /* spotless:on */ } override fun toString(): String { return when { - double != null -> "Value{double=$double}" - boolean != null -> "Value{boolean=$boolean}" + number != null -> "Value{number=$number}" + bool != null -> "Value{bool=$bool}" string != null -> "Value{string=$string}" strings != null -> "Value{strings=$strings}" _json != null -> "Value{_unknown=$_json}" @@ -1412,9 +1230,9 @@ private constructor( companion object { - @JvmStatic fun ofDouble(double: Double) = Value(double = double) + @JvmStatic fun ofNumber(number: Double) = Value(number = number) - @JvmStatic fun ofBoolean(boolean: Boolean) = Value(boolean = boolean) + @JvmStatic fun ofBool(bool: Boolean) = Value(bool = bool) @JvmStatic fun ofString(string: String) = Value(string = string) @@ -1423,9 +1241,9 @@ private constructor( interface Visitor { - fun visitDouble(double: Double): T + fun visitNumber(number: Double): T - fun visitBoolean(boolean: Boolean): T + fun visitBool(bool: Boolean): T fun visitString(string: String): T @@ -1440,11 +1258,12 @@ private constructor( override fun ObjectCodec.deserialize(node: JsonNode): Value { val json = JsonValue.fromJsonNode(node) + tryDeserialize(node, jacksonTypeRef())?.let { - return Value(double = it, _json = json) + return Value(number = it, _json = json) } tryDeserialize(node, jacksonTypeRef())?.let { - return Value(boolean = it, _json = json) + return Value(bool = it, _json = json) } tryDeserialize(node, jacksonTypeRef())?.let { return Value(string = it, _json = json) @@ -1465,8 +1284,8 @@ private constructor( provider: SerializerProvider ) { when { - value.double != null -> generator.writeObject(value.double) - value.boolean != null -> generator.writeObject(value.boolean) + value.number != null -> generator.writeObject(value.number) + value.bool != null -> generator.writeObject(value.bool) value.string != null -> generator.writeObject(value.string) value.strings != null -> generator.writeObject(value.strings) value._json != null -> generator.writeObject(value._json) @@ -1475,7 +1294,87 @@ private constructor( } } } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is Threshold && this.measurement == other.measurement && this.insightName == other.insightName && this.insightParameters == other.insightParameters && this.operator == other.operator && this.value == other.value && this.additionalProperties == other.additionalProperties /* spotless:on */ + } + + private var hashCode: Int = 0 + + override fun hashCode(): Int { + if (hashCode == 0) { + hashCode = /* spotless:off */ Objects.hash(measurement, insightName, insightParameters, operator, value, additionalProperties) /* spotless:on */ + } + return hashCode + } + + override fun toString() = + "Threshold{measurement=$measurement, insightName=$insightName, insightParameters=$insightParameters, operator=$operator, value=$value, additionalProperties=$additionalProperties}" + } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is Goal && this.id == other.id && this.number == other.number && this.name == other.name && this.dateCreated == other.dateCreated && this.dateUpdated == other.dateUpdated && this.description == other.description && this.evaluationWindow == other.evaluationWindow && this.delayWindow == other.delayWindow && this.type == other.type && this.subtype == other.subtype && this.creatorId == other.creatorId && this.originProjectVersionId == other.originProjectVersionId && this.thresholds == other.thresholds && this.archived == other.archived && this.dateArchived == other.dateArchived && this.suggested == other.suggested && this.commentCount == other.commentCount && this.usesMlModel == other.usesMlModel && this.usesValidationDataset == other.usesValidationDataset && this.usesTrainingDataset == other.usesTrainingDataset && this.usesReferenceDataset == other.usesReferenceDataset && this.usesProductionData == other.usesProductionData && this.additionalProperties == other.additionalProperties /* spotless:on */ } + + private var hashCode: Int = 0 + + override fun hashCode(): Int { + if (hashCode == 0) { + hashCode = /* spotless:off */ Objects.hash(id, number, name, dateCreated, dateUpdated, description, evaluationWindow, delayWindow, type, subtype, creatorId, originProjectVersionId, thresholds, archived, dateArchived, suggested, commentCount, usesMlModel, usesValidationDataset, usesTrainingDataset, usesReferenceDataset, usesProductionData, additionalProperties) /* spotless:on */ + } + return hashCode + } + + override fun toString() = + "Goal{id=$id, number=$number, name=$name, dateCreated=$dateCreated, dateUpdated=$dateUpdated, description=$description, evaluationWindow=$evaluationWindow, delayWindow=$delayWindow, type=$type, subtype=$subtype, creatorId=$creatorId, originProjectVersionId=$originProjectVersionId, thresholds=$thresholds, archived=$archived, dateArchived=$dateArchived, suggested=$suggested, commentCount=$commentCount, usesMlModel=$usesMlModel, usesValidationDataset=$usesValidationDataset, usesTrainingDataset=$usesTrainingDataset, usesReferenceDataset=$usesReferenceDataset, usesProductionData=$usesProductionData, additionalProperties=$additionalProperties}" + } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is Item && this.id == other.id && this.goal == other.goal && this.goalId == other.goalId && this.projectVersionId == other.projectVersionId && this.inferencePipelineId == other.inferencePipelineId && this.dateCreated == other.dateCreated && this.dateUpdated == other.dateUpdated && this.dateDataStarts == other.dateDataStarts && this.dateDataEnds == other.dateDataEnds && this.status == other.status && this.statusMessage == other.statusMessage && this.additionalProperties == other.additionalProperties /* spotless:on */ } + + private var hashCode: Int = 0 + + override fun hashCode(): Int { + if (hashCode == 0) { + hashCode = /* spotless:off */ Objects.hash(id, goal, goalId, projectVersionId, inferencePipelineId, dateCreated, dateUpdated, dateDataStarts, dateDataEnds, status, statusMessage, additionalProperties) /* spotless:on */ + } + return hashCode + } + + override fun toString() = + "Item{id=$id, goal=$goal, goalId=$goalId, projectVersionId=$projectVersionId, inferencePipelineId=$inferencePipelineId, dateCreated=$dateCreated, dateUpdated=$dateUpdated, dateDataStarts=$dateDataStarts, dateDataEnds=$dateDataEnds, status=$status, statusMessage=$statusMessage, additionalProperties=$additionalProperties}" } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is InferencePipelineTestResultListResponse && this.items == other.items && this.additionalProperties == other.additionalProperties /* spotless:on */ + } + + private var hashCode: Int = 0 + + override fun hashCode(): Int { + if (hashCode == 0) { + hashCode = /* spotless:off */ Objects.hash(items, additionalProperties) /* spotless:on */ + } + return hashCode + } + + override fun toString() = + "InferencePipelineTestResultListResponse{items=$items, additionalProperties=$additionalProperties}" } diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/InferencePipelineUpdateParams.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/InferencePipelineUpdateParams.kt index 66bece6..f5810d6 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/InferencePipelineUpdateParams.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/InferencePipelineUpdateParams.kt @@ -9,7 +9,9 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize import com.openlayer.api.core.ExcludeMissing import com.openlayer.api.core.JsonValue import com.openlayer.api.core.NoAutoDetect -import com.openlayer.api.core.toUnmodifiable +import com.openlayer.api.core.http.Headers +import com.openlayer.api.core.http.QueryParams +import com.openlayer.api.core.toImmutable import com.openlayer.api.models.* import java.util.Objects import java.util.Optional @@ -20,8 +22,8 @@ constructor( private val description: String?, private val name: String?, private val referenceDatasetUri: String?, - private val additionalQueryParams: Map>, - private val additionalHeaders: Map>, + private val additionalHeaders: Headers, + private val additionalQueryParams: QueryParams, private val additionalBodyProperties: Map, ) { @@ -43,9 +45,9 @@ constructor( ) } - @JvmSynthetic internal fun getQueryParams(): Map> = additionalQueryParams + @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders - @JvmSynthetic internal fun getHeaders(): Map> = additionalHeaders + @JvmSynthetic internal fun getQueryParams(): QueryParams = additionalQueryParams fun getPathParam(index: Int): String { return when (index) { @@ -64,8 +66,6 @@ constructor( private val additionalProperties: Map, ) { - private var hashCode: Int = 0 - /** The inference pipeline description. */ @JsonProperty("description") fun description(): String? = description @@ -85,34 +85,6 @@ constructor( fun toBuilder() = Builder().from(this) - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return other is InferencePipelineUpdateBody && - this.description == other.description && - this.name == other.name && - this.referenceDatasetUri == other.referenceDatasetUri && - this.additionalProperties == other.additionalProperties - } - - override fun hashCode(): Int { - if (hashCode == 0) { - hashCode = - Objects.hash( - description, - name, - referenceDatasetUri, - additionalProperties, - ) - } - return hashCode - } - - override fun toString() = - "InferencePipelineUpdateBody{description=$description, name=$name, referenceDatasetUri=$referenceDatasetUri, additionalProperties=$additionalProperties}" - companion object { @JvmStatic fun builder() = Builder() @@ -168,14 +140,34 @@ constructor( description, name, referenceDatasetUri, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is InferencePipelineUpdateBody && this.description == other.description && this.name == other.name && this.referenceDatasetUri == other.referenceDatasetUri && this.additionalProperties == other.additionalProperties /* spotless:on */ + } + + private var hashCode: Int = 0 + + override fun hashCode(): Int { + if (hashCode == 0) { + hashCode = /* spotless:off */ Objects.hash(description, name, referenceDatasetUri, additionalProperties) /* spotless:on */ + } + return hashCode + } + + override fun toString() = + "InferencePipelineUpdateBody{description=$description, name=$name, referenceDatasetUri=$referenceDatasetUri, additionalProperties=$additionalProperties}" } - fun _additionalQueryParams(): Map> = additionalQueryParams + fun _additionalHeaders(): Headers = additionalHeaders - fun _additionalHeaders(): Map> = additionalHeaders + fun _additionalQueryParams(): QueryParams = additionalQueryParams fun _additionalBodyProperties(): Map = additionalBodyProperties @@ -184,30 +176,15 @@ constructor( return true } - return other is InferencePipelineUpdateParams && - this.inferencePipelineId == other.inferencePipelineId && - this.description == other.description && - this.name == other.name && - this.referenceDatasetUri == other.referenceDatasetUri && - this.additionalQueryParams == other.additionalQueryParams && - this.additionalHeaders == other.additionalHeaders && - this.additionalBodyProperties == other.additionalBodyProperties + return /* spotless:off */ other is InferencePipelineUpdateParams && this.inferencePipelineId == other.inferencePipelineId && this.description == other.description && this.name == other.name && this.referenceDatasetUri == other.referenceDatasetUri && this.additionalHeaders == other.additionalHeaders && this.additionalQueryParams == other.additionalQueryParams && this.additionalBodyProperties == other.additionalBodyProperties /* spotless:on */ } override fun hashCode(): Int { - return Objects.hash( - inferencePipelineId, - description, - name, - referenceDatasetUri, - additionalQueryParams, - additionalHeaders, - additionalBodyProperties, - ) + return /* spotless:off */ Objects.hash(inferencePipelineId, description, name, referenceDatasetUri, additionalHeaders, additionalQueryParams, additionalBodyProperties) /* spotless:on */ } override fun toString() = - "InferencePipelineUpdateParams{inferencePipelineId=$inferencePipelineId, description=$description, name=$name, referenceDatasetUri=$referenceDatasetUri, additionalQueryParams=$additionalQueryParams, additionalHeaders=$additionalHeaders, additionalBodyProperties=$additionalBodyProperties}" + "InferencePipelineUpdateParams{inferencePipelineId=$inferencePipelineId, description=$description, name=$name, referenceDatasetUri=$referenceDatasetUri, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams, additionalBodyProperties=$additionalBodyProperties}" fun toBuilder() = Builder().from(this) @@ -223,8 +200,8 @@ constructor( private var description: String? = null private var name: String? = null private var referenceDatasetUri: String? = null - private var additionalQueryParams: MutableMap> = mutableMapOf() - private var additionalHeaders: MutableMap> = mutableMapOf() + private var additionalHeaders: Headers.Builder = Headers.builder() + private var additionalQueryParams: QueryParams.Builder = QueryParams.builder() private var additionalBodyProperties: MutableMap = mutableMapOf() @JvmSynthetic @@ -233,8 +210,8 @@ constructor( this.description = inferencePipelineUpdateParams.description this.name = inferencePipelineUpdateParams.name this.referenceDatasetUri = inferencePipelineUpdateParams.referenceDatasetUri - additionalQueryParams(inferencePipelineUpdateParams.additionalQueryParams) additionalHeaders(inferencePipelineUpdateParams.additionalHeaders) + additionalQueryParams(inferencePipelineUpdateParams.additionalQueryParams) additionalBodyProperties(inferencePipelineUpdateParams.additionalBodyProperties) } @@ -256,53 +233,111 @@ constructor( this.referenceDatasetUri = referenceDatasetUri } - fun additionalQueryParams(additionalQueryParams: Map>) = apply { - this.additionalQueryParams.clear() - putAllQueryParams(additionalQueryParams) + fun additionalHeaders(additionalHeaders: Headers) = apply { + this.additionalHeaders.clear() + putAllAdditionalHeaders(additionalHeaders) } - fun putQueryParam(name: String, value: String) = apply { - this.additionalQueryParams.getOrPut(name) { mutableListOf() }.add(value) + fun additionalHeaders(additionalHeaders: Map>) = apply { + this.additionalHeaders.clear() + putAllAdditionalHeaders(additionalHeaders) } - fun putQueryParams(name: String, values: Iterable) = apply { - this.additionalQueryParams.getOrPut(name) { mutableListOf() }.addAll(values) + fun putAdditionalHeader(name: String, value: String) = apply { + additionalHeaders.put(name, value) } - fun putAllQueryParams(additionalQueryParams: Map>) = apply { - additionalQueryParams.forEach(this::putQueryParams) + fun putAdditionalHeaders(name: String, values: Iterable) = apply { + additionalHeaders.put(name, values) } - fun removeQueryParam(name: String) = apply { - this.additionalQueryParams.put(name, mutableListOf()) + fun putAllAdditionalHeaders(additionalHeaders: Headers) = apply { + this.additionalHeaders.putAll(additionalHeaders) } - fun additionalHeaders(additionalHeaders: Map>) = apply { - this.additionalHeaders.clear() - putAllHeaders(additionalHeaders) + fun putAllAdditionalHeaders(additionalHeaders: Map>) = apply { + this.additionalHeaders.putAll(additionalHeaders) + } + + fun replaceAdditionalHeaders(name: String, value: String) = apply { + additionalHeaders.replace(name, value) + } + + fun replaceAdditionalHeaders(name: String, values: Iterable) = apply { + additionalHeaders.replace(name, values) + } + + fun replaceAllAdditionalHeaders(additionalHeaders: Headers) = apply { + this.additionalHeaders.replaceAll(additionalHeaders) + } + + fun replaceAllAdditionalHeaders(additionalHeaders: Map>) = apply { + this.additionalHeaders.replaceAll(additionalHeaders) + } + + fun removeAdditionalHeaders(name: String) = apply { additionalHeaders.remove(name) } + + fun removeAllAdditionalHeaders(names: Set) = apply { + additionalHeaders.removeAll(names) + } + + fun additionalQueryParams(additionalQueryParams: QueryParams) = apply { + this.additionalQueryParams.clear() + putAllAdditionalQueryParams(additionalQueryParams) } - fun putHeader(name: String, value: String) = apply { - this.additionalHeaders.getOrPut(name) { mutableListOf() }.add(value) + fun additionalQueryParams(additionalQueryParams: Map>) = apply { + this.additionalQueryParams.clear() + putAllAdditionalQueryParams(additionalQueryParams) + } + + fun putAdditionalQueryParam(key: String, value: String) = apply { + additionalQueryParams.put(key, value) } - fun putHeaders(name: String, values: Iterable) = apply { - this.additionalHeaders.getOrPut(name) { mutableListOf() }.addAll(values) + fun putAdditionalQueryParams(key: String, values: Iterable) = apply { + additionalQueryParams.put(key, values) } - fun putAllHeaders(additionalHeaders: Map>) = apply { - additionalHeaders.forEach(this::putHeaders) + fun putAllAdditionalQueryParams(additionalQueryParams: QueryParams) = apply { + this.additionalQueryParams.putAll(additionalQueryParams) } - fun removeHeader(name: String) = apply { this.additionalHeaders.put(name, mutableListOf()) } + fun putAllAdditionalQueryParams(additionalQueryParams: Map>) = + apply { + this.additionalQueryParams.putAll(additionalQueryParams) + } + + fun replaceAdditionalQueryParams(key: String, value: String) = apply { + additionalQueryParams.replace(key, value) + } + + fun replaceAdditionalQueryParams(key: String, values: Iterable) = apply { + additionalQueryParams.replace(key, values) + } + + fun replaceAllAdditionalQueryParams(additionalQueryParams: QueryParams) = apply { + this.additionalQueryParams.replaceAll(additionalQueryParams) + } + + fun replaceAllAdditionalQueryParams(additionalQueryParams: Map>) = + apply { + this.additionalQueryParams.replaceAll(additionalQueryParams) + } + + fun removeAdditionalQueryParams(key: String) = apply { additionalQueryParams.remove(key) } + + fun removeAllAdditionalQueryParams(keys: Set) = apply { + additionalQueryParams.removeAll(keys) + } fun additionalBodyProperties(additionalBodyProperties: Map) = apply { this.additionalBodyProperties.clear() - this.additionalBodyProperties.putAll(additionalBodyProperties) + putAllAdditionalBodyProperties(additionalBodyProperties) } fun putAdditionalBodyProperty(key: String, value: JsonValue) = apply { - this.additionalBodyProperties.put(key, value) + additionalBodyProperties.put(key, value) } fun putAllAdditionalBodyProperties(additionalBodyProperties: Map) = @@ -310,6 +345,14 @@ constructor( this.additionalBodyProperties.putAll(additionalBodyProperties) } + fun removeAdditionalBodyProperty(key: String) = apply { + additionalBodyProperties.remove(key) + } + + fun removeAllAdditionalBodyProperties(keys: Set) = apply { + keys.forEach(::removeAdditionalBodyProperty) + } + fun build(): InferencePipelineUpdateParams = InferencePipelineUpdateParams( checkNotNull(inferencePipelineId) { @@ -318,9 +361,9 @@ constructor( description, name, referenceDatasetUri, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + additionalHeaders.build(), + additionalQueryParams.build(), + additionalBodyProperties.toImmutable(), ) } } diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/InferencePipelineUpdateResponse.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/InferencePipelineUpdateResponse.kt index 3e7d741..f5cdb6c 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/InferencePipelineUpdateResponse.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/InferencePipelineUpdateResponse.kt @@ -13,7 +13,7 @@ import com.openlayer.api.core.JsonField import com.openlayer.api.core.JsonMissing import com.openlayer.api.core.JsonValue import com.openlayer.api.core.NoAutoDetect -import com.openlayer.api.core.toUnmodifiable +import com.openlayer.api.core.toImmutable import com.openlayer.api.errors.OpenlayerInvalidDataException import java.time.OffsetDateTime import java.util.Objects @@ -43,8 +43,6 @@ private constructor( private var validated: Boolean = false - private var hashCode: Int = 0 - /** The inference pipeline id. */ fun id(): String = id.getRequired("id") @@ -169,58 +167,6 @@ private constructor( fun toBuilder() = Builder().from(this) - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return other is InferencePipelineUpdateResponse && - this.id == other.id && - this.projectId == other.projectId && - this.name == other.name && - this.dateCreated == other.dateCreated && - this.dateUpdated == other.dateUpdated && - this.dateLastSampleReceived == other.dateLastSampleReceived && - this.description == other.description && - this.dateLastEvaluated == other.dateLastEvaluated && - this.dateOfNextEvaluation == other.dateOfNextEvaluation && - this.passingGoalCount == other.passingGoalCount && - this.failingGoalCount == other.failingGoalCount && - this.totalGoalCount == other.totalGoalCount && - this.status == other.status && - this.statusMessage == other.statusMessage && - this.links == other.links && - this.additionalProperties == other.additionalProperties - } - - override fun hashCode(): Int { - if (hashCode == 0) { - hashCode = - Objects.hash( - id, - projectId, - name, - dateCreated, - dateUpdated, - dateLastSampleReceived, - description, - dateLastEvaluated, - dateOfNextEvaluation, - passingGoalCount, - failingGoalCount, - totalGoalCount, - status, - statusMessage, - links, - additionalProperties, - ) - } - return hashCode - } - - override fun toString() = - "InferencePipelineUpdateResponse{id=$id, projectId=$projectId, name=$name, dateCreated=$dateCreated, dateUpdated=$dateUpdated, dateLastSampleReceived=$dateLastSampleReceived, description=$description, dateLastEvaluated=$dateLastEvaluated, dateOfNextEvaluation=$dateOfNextEvaluation, passingGoalCount=$passingGoalCount, failingGoalCount=$failingGoalCount, totalGoalCount=$totalGoalCount, status=$status, statusMessage=$statusMessage, links=$links, additionalProperties=$additionalProperties}" - companion object { @JvmStatic fun builder() = Builder() @@ -436,7 +382,7 @@ private constructor( status, statusMessage, links, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -450,8 +396,6 @@ private constructor( private var validated: Boolean = false - private var hashCode: Int = 0 - fun app(): String = app.getRequired("app") @JsonProperty("app") @ExcludeMissing fun _app() = app @@ -469,25 +413,6 @@ private constructor( fun toBuilder() = Builder().from(this) - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return other is Links && - this.app == other.app && - this.additionalProperties == other.additionalProperties - } - - override fun hashCode(): Int { - if (hashCode == 0) { - hashCode = Objects.hash(app, additionalProperties) - } - return hashCode - } - - override fun toString() = "Links{app=$app, additionalProperties=$additionalProperties}" - companion object { @JvmStatic fun builder() = Builder() @@ -524,8 +449,27 @@ private constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): Links = Links(app, additionalProperties.toUnmodifiable()) + fun build(): Links = Links(app, additionalProperties.toImmutable()) } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is Links && this.app == other.app && this.additionalProperties == other.additionalProperties /* spotless:on */ + } + + private var hashCode: Int = 0 + + override fun hashCode(): Int { + if (hashCode == 0) { + hashCode = /* spotless:off */ Objects.hash(app, additionalProperties) /* spotless:on */ + } + return hashCode + } + + override fun toString() = "Links{app=$app, additionalProperties=$additionalProperties}" } class Status @@ -541,7 +485,7 @@ private constructor( return true } - return other is Status && this.value == other.value + return /* spotless:off */ other is Status && this.value == other.value /* spotless:on */ } override fun hashCode() = value.hashCode() @@ -608,4 +552,24 @@ private constructor( fun asString(): String = _value().asStringOrThrow() } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is InferencePipelineUpdateResponse && this.id == other.id && this.projectId == other.projectId && this.name == other.name && this.dateCreated == other.dateCreated && this.dateUpdated == other.dateUpdated && this.dateLastSampleReceived == other.dateLastSampleReceived && this.description == other.description && this.dateLastEvaluated == other.dateLastEvaluated && this.dateOfNextEvaluation == other.dateOfNextEvaluation && this.passingGoalCount == other.passingGoalCount && this.failingGoalCount == other.failingGoalCount && this.totalGoalCount == other.totalGoalCount && this.status == other.status && this.statusMessage == other.statusMessage && this.links == other.links && this.additionalProperties == other.additionalProperties /* spotless:on */ + } + + private var hashCode: Int = 0 + + override fun hashCode(): Int { + if (hashCode == 0) { + hashCode = /* spotless:off */ Objects.hash(id, projectId, name, dateCreated, dateUpdated, dateLastSampleReceived, description, dateLastEvaluated, dateOfNextEvaluation, passingGoalCount, failingGoalCount, totalGoalCount, status, statusMessage, links, additionalProperties) /* spotless:on */ + } + return hashCode + } + + override fun toString() = + "InferencePipelineUpdateResponse{id=$id, projectId=$projectId, name=$name, dateCreated=$dateCreated, dateUpdated=$dateUpdated, dateLastSampleReceived=$dateLastSampleReceived, description=$description, dateLastEvaluated=$dateLastEvaluated, dateOfNextEvaluation=$dateOfNextEvaluation, passingGoalCount=$passingGoalCount, failingGoalCount=$failingGoalCount, totalGoalCount=$totalGoalCount, status=$status, statusMessage=$statusMessage, links=$links, additionalProperties=$additionalProperties}" } diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/ProjectCommitCreateParams.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/ProjectCommitCreateParams.kt new file mode 100644 index 0000000..173a2b1 --- /dev/null +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/ProjectCommitCreateParams.kt @@ -0,0 +1,741 @@ +// File generated from our OpenAPI spec by Stainless. + +package com.openlayer.api.models + +import com.fasterxml.jackson.annotation.JsonAnyGetter +import com.fasterxml.jackson.annotation.JsonAnySetter +import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonProperty +import com.fasterxml.jackson.databind.annotation.JsonDeserialize +import com.openlayer.api.core.Enum +import com.openlayer.api.core.ExcludeMissing +import com.openlayer.api.core.JsonField +import com.openlayer.api.core.JsonValue +import com.openlayer.api.core.NoAutoDetect +import com.openlayer.api.core.http.Headers +import com.openlayer.api.core.http.QueryParams +import com.openlayer.api.core.toImmutable +import com.openlayer.api.errors.OpenlayerInvalidDataException +import com.openlayer.api.models.* +import java.time.OffsetDateTime +import java.util.Objects +import java.util.Optional + +class ProjectCommitCreateParams +constructor( + private val projectId: String, + private val commit: Commit, + private val storageUri: String, + private val archived: Boolean?, + private val deploymentStatus: String?, + private val additionalHeaders: Headers, + private val additionalQueryParams: QueryParams, + private val additionalBodyProperties: Map, +) { + + fun projectId(): String = projectId + + fun commit(): Commit = commit + + fun storageUri(): String = storageUri + + fun archived(): Optional = Optional.ofNullable(archived) + + fun deploymentStatus(): Optional = Optional.ofNullable(deploymentStatus) + + @JvmSynthetic + internal fun getBody(): ProjectCommitCreateBody { + return ProjectCommitCreateBody( + commit, + storageUri, + archived, + deploymentStatus, + additionalBodyProperties, + ) + } + + @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + + @JvmSynthetic internal fun getQueryParams(): QueryParams = additionalQueryParams + + fun getPathParam(index: Int): String { + return when (index) { + 0 -> projectId + else -> "" + } + } + + @JsonDeserialize(builder = ProjectCommitCreateBody.Builder::class) + @NoAutoDetect + class ProjectCommitCreateBody + internal constructor( + private val commit: Commit?, + private val storageUri: String?, + private val archived: Boolean?, + private val deploymentStatus: String?, + private val additionalProperties: Map, + ) { + + /** The details of a commit (project version). */ + @JsonProperty("commit") fun commit(): Commit? = commit + + /** The storage URI where the commit bundle is stored. */ + @JsonProperty("storageUri") fun storageUri(): String? = storageUri + + /** Whether the commit is archived. */ + @JsonProperty("archived") fun archived(): Boolean? = archived + + /** The deployment status associated with the commit's model. */ + @JsonProperty("deploymentStatus") fun deploymentStatus(): String? = deploymentStatus + + @JsonAnyGetter + @ExcludeMissing + fun _additionalProperties(): Map = additionalProperties + + fun toBuilder() = Builder().from(this) + + companion object { + + @JvmStatic fun builder() = Builder() + } + + class Builder { + + private var commit: Commit? = null + private var storageUri: String? = null + private var archived: Boolean? = null + private var deploymentStatus: String? = null + private var additionalProperties: MutableMap = mutableMapOf() + + @JvmSynthetic + internal fun from(projectCommitCreateBody: ProjectCommitCreateBody) = apply { + this.commit = projectCommitCreateBody.commit + this.storageUri = projectCommitCreateBody.storageUri + this.archived = projectCommitCreateBody.archived + this.deploymentStatus = projectCommitCreateBody.deploymentStatus + additionalProperties(projectCommitCreateBody.additionalProperties) + } + + /** The details of a commit (project version). */ + @JsonProperty("commit") fun commit(commit: Commit) = apply { this.commit = commit } + + /** The storage URI where the commit bundle is stored. */ + @JsonProperty("storageUri") + fun storageUri(storageUri: String) = apply { this.storageUri = storageUri } + + /** Whether the commit is archived. */ + @JsonProperty("archived") + fun archived(archived: Boolean) = apply { this.archived = archived } + + /** The deployment status associated with the commit's model. */ + @JsonProperty("deploymentStatus") + fun deploymentStatus(deploymentStatus: String) = apply { + this.deploymentStatus = deploymentStatus + } + + fun additionalProperties(additionalProperties: Map) = apply { + this.additionalProperties.clear() + this.additionalProperties.putAll(additionalProperties) + } + + @JsonAnySetter + fun putAdditionalProperty(key: String, value: JsonValue) = apply { + this.additionalProperties.put(key, value) + } + + fun putAllAdditionalProperties(additionalProperties: Map) = apply { + this.additionalProperties.putAll(additionalProperties) + } + + fun build(): ProjectCommitCreateBody = + ProjectCommitCreateBody( + checkNotNull(commit) { "`commit` is required but was not set" }, + checkNotNull(storageUri) { "`storageUri` is required but was not set" }, + archived, + deploymentStatus, + additionalProperties.toImmutable(), + ) + } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is ProjectCommitCreateBody && this.commit == other.commit && this.storageUri == other.storageUri && this.archived == other.archived && this.deploymentStatus == other.deploymentStatus && this.additionalProperties == other.additionalProperties /* spotless:on */ + } + + private var hashCode: Int = 0 + + override fun hashCode(): Int { + if (hashCode == 0) { + hashCode = /* spotless:off */ Objects.hash(commit, storageUri, archived, deploymentStatus, additionalProperties) /* spotless:on */ + } + return hashCode + } + + override fun toString() = + "ProjectCommitCreateBody{commit=$commit, storageUri=$storageUri, archived=$archived, deploymentStatus=$deploymentStatus, additionalProperties=$additionalProperties}" + } + + fun _additionalHeaders(): Headers = additionalHeaders + + fun _additionalQueryParams(): QueryParams = additionalQueryParams + + fun _additionalBodyProperties(): Map = additionalBodyProperties + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is ProjectCommitCreateParams && this.projectId == other.projectId && this.commit == other.commit && this.storageUri == other.storageUri && this.archived == other.archived && this.deploymentStatus == other.deploymentStatus && this.additionalHeaders == other.additionalHeaders && this.additionalQueryParams == other.additionalQueryParams && this.additionalBodyProperties == other.additionalBodyProperties /* spotless:on */ + } + + override fun hashCode(): Int { + return /* spotless:off */ Objects.hash(projectId, commit, storageUri, archived, deploymentStatus, additionalHeaders, additionalQueryParams, additionalBodyProperties) /* spotless:on */ + } + + override fun toString() = + "ProjectCommitCreateParams{projectId=$projectId, commit=$commit, storageUri=$storageUri, archived=$archived, deploymentStatus=$deploymentStatus, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams, additionalBodyProperties=$additionalBodyProperties}" + + fun toBuilder() = Builder().from(this) + + companion object { + + @JvmStatic fun builder() = Builder() + } + + @NoAutoDetect + class Builder { + + private var projectId: String? = null + private var commit: Commit? = null + private var storageUri: String? = null + private var archived: Boolean? = null + private var deploymentStatus: String? = null + private var additionalHeaders: Headers.Builder = Headers.builder() + private var additionalQueryParams: QueryParams.Builder = QueryParams.builder() + private var additionalBodyProperties: MutableMap = mutableMapOf() + + @JvmSynthetic + internal fun from(projectCommitCreateParams: ProjectCommitCreateParams) = apply { + this.projectId = projectCommitCreateParams.projectId + this.commit = projectCommitCreateParams.commit + this.storageUri = projectCommitCreateParams.storageUri + this.archived = projectCommitCreateParams.archived + this.deploymentStatus = projectCommitCreateParams.deploymentStatus + additionalHeaders(projectCommitCreateParams.additionalHeaders) + additionalQueryParams(projectCommitCreateParams.additionalQueryParams) + additionalBodyProperties(projectCommitCreateParams.additionalBodyProperties) + } + + fun projectId(projectId: String) = apply { this.projectId = projectId } + + /** The details of a commit (project version). */ + fun commit(commit: Commit) = apply { this.commit = commit } + + /** The storage URI where the commit bundle is stored. */ + fun storageUri(storageUri: String) = apply { this.storageUri = storageUri } + + /** Whether the commit is archived. */ + fun archived(archived: Boolean) = apply { this.archived = archived } + + /** The deployment status associated with the commit's model. */ + fun deploymentStatus(deploymentStatus: String) = apply { + this.deploymentStatus = deploymentStatus + } + + fun additionalHeaders(additionalHeaders: Headers) = apply { + this.additionalHeaders.clear() + putAllAdditionalHeaders(additionalHeaders) + } + + fun additionalHeaders(additionalHeaders: Map>) = apply { + this.additionalHeaders.clear() + putAllAdditionalHeaders(additionalHeaders) + } + + fun putAdditionalHeader(name: String, value: String) = apply { + additionalHeaders.put(name, value) + } + + fun putAdditionalHeaders(name: String, values: Iterable) = apply { + additionalHeaders.put(name, values) + } + + fun putAllAdditionalHeaders(additionalHeaders: Headers) = apply { + this.additionalHeaders.putAll(additionalHeaders) + } + + fun putAllAdditionalHeaders(additionalHeaders: Map>) = apply { + this.additionalHeaders.putAll(additionalHeaders) + } + + fun replaceAdditionalHeaders(name: String, value: String) = apply { + additionalHeaders.replace(name, value) + } + + fun replaceAdditionalHeaders(name: String, values: Iterable) = apply { + additionalHeaders.replace(name, values) + } + + fun replaceAllAdditionalHeaders(additionalHeaders: Headers) = apply { + this.additionalHeaders.replaceAll(additionalHeaders) + } + + fun replaceAllAdditionalHeaders(additionalHeaders: Map>) = apply { + this.additionalHeaders.replaceAll(additionalHeaders) + } + + fun removeAdditionalHeaders(name: String) = apply { additionalHeaders.remove(name) } + + fun removeAllAdditionalHeaders(names: Set) = apply { + additionalHeaders.removeAll(names) + } + + fun additionalQueryParams(additionalQueryParams: QueryParams) = apply { + this.additionalQueryParams.clear() + putAllAdditionalQueryParams(additionalQueryParams) + } + + fun additionalQueryParams(additionalQueryParams: Map>) = apply { + this.additionalQueryParams.clear() + putAllAdditionalQueryParams(additionalQueryParams) + } + + fun putAdditionalQueryParam(key: String, value: String) = apply { + additionalQueryParams.put(key, value) + } + + fun putAdditionalQueryParams(key: String, values: Iterable) = apply { + additionalQueryParams.put(key, values) + } + + fun putAllAdditionalQueryParams(additionalQueryParams: QueryParams) = apply { + this.additionalQueryParams.putAll(additionalQueryParams) + } + + fun putAllAdditionalQueryParams(additionalQueryParams: Map>) = + apply { + this.additionalQueryParams.putAll(additionalQueryParams) + } + + fun replaceAdditionalQueryParams(key: String, value: String) = apply { + additionalQueryParams.replace(key, value) + } + + fun replaceAdditionalQueryParams(key: String, values: Iterable) = apply { + additionalQueryParams.replace(key, values) + } + + fun replaceAllAdditionalQueryParams(additionalQueryParams: QueryParams) = apply { + this.additionalQueryParams.replaceAll(additionalQueryParams) + } + + fun replaceAllAdditionalQueryParams(additionalQueryParams: Map>) = + apply { + this.additionalQueryParams.replaceAll(additionalQueryParams) + } + + fun removeAdditionalQueryParams(key: String) = apply { additionalQueryParams.remove(key) } + + fun removeAllAdditionalQueryParams(keys: Set) = apply { + additionalQueryParams.removeAll(keys) + } + + fun additionalBodyProperties(additionalBodyProperties: Map) = apply { + this.additionalBodyProperties.clear() + putAllAdditionalBodyProperties(additionalBodyProperties) + } + + fun putAdditionalBodyProperty(key: String, value: JsonValue) = apply { + additionalBodyProperties.put(key, value) + } + + fun putAllAdditionalBodyProperties(additionalBodyProperties: Map) = + apply { + this.additionalBodyProperties.putAll(additionalBodyProperties) + } + + fun removeAdditionalBodyProperty(key: String) = apply { + additionalBodyProperties.remove(key) + } + + fun removeAllAdditionalBodyProperties(keys: Set) = apply { + keys.forEach(::removeAdditionalBodyProperty) + } + + fun build(): ProjectCommitCreateParams = + ProjectCommitCreateParams( + checkNotNull(projectId) { "`projectId` is required but was not set" }, + checkNotNull(commit) { "`commit` is required but was not set" }, + checkNotNull(storageUri) { "`storageUri` is required but was not set" }, + archived, + deploymentStatus, + additionalHeaders.build(), + additionalQueryParams.build(), + additionalBodyProperties.toImmutable(), + ) + } + + /** The details of a commit (project version). */ + @JsonDeserialize(builder = Commit.Builder::class) + @NoAutoDetect + class Commit + private constructor( + private val id: String?, + private val authorId: String?, + private val dateCreated: OffsetDateTime?, + private val fileSize: Long?, + private val message: String?, + private val mlModelId: String?, + private val validationDatasetId: String?, + private val trainingDatasetId: String?, + private val storageUri: String?, + private val gitCommitSha: Long?, + private val gitCommitRef: String?, + private val gitCommitUrl: String?, + private val additionalProperties: Map, + ) { + + /** The commit id. */ + @JsonProperty("id") fun id(): String? = id + + /** The author id of the commit. */ + @JsonProperty("authorId") fun authorId(): String? = authorId + + /** The commit creation date. */ + @JsonProperty("dateCreated") fun dateCreated(): OffsetDateTime? = dateCreated + + /** The size of the commit bundle in bytes. */ + @JsonProperty("fileSize") fun fileSize(): Long? = fileSize + + /** The commit message. */ + @JsonProperty("message") fun message(): String? = message + + /** The model id. */ + @JsonProperty("mlModelId") fun mlModelId(): String? = mlModelId + + /** The validation dataset id. */ + @JsonProperty("validationDatasetId") + fun validationDatasetId(): String? = validationDatasetId + + /** The training dataset id. */ + @JsonProperty("trainingDatasetId") fun trainingDatasetId(): String? = trainingDatasetId + + /** The storage URI where the commit bundle is stored. */ + @JsonProperty("storageUri") fun storageUri(): String? = storageUri + + /** The SHA of the corresponding git commit. */ + @JsonProperty("gitCommitSha") fun gitCommitSha(): Long? = gitCommitSha + + /** The ref of the corresponding git commit. */ + @JsonProperty("gitCommitRef") fun gitCommitRef(): String? = gitCommitRef + + /** The URL of the corresponding git commit. */ + @JsonProperty("gitCommitUrl") fun gitCommitUrl(): String? = gitCommitUrl + + @JsonAnyGetter + @ExcludeMissing + fun _additionalProperties(): Map = additionalProperties + + fun toBuilder() = Builder().from(this) + + companion object { + + @JvmStatic fun builder() = Builder() + } + + class Builder { + + private var id: String? = null + private var authorId: String? = null + private var dateCreated: OffsetDateTime? = null + private var fileSize: Long? = null + private var message: String? = null + private var mlModelId: String? = null + private var validationDatasetId: String? = null + private var trainingDatasetId: String? = null + private var storageUri: String? = null + private var gitCommitSha: Long? = null + private var gitCommitRef: String? = null + private var gitCommitUrl: String? = null + private var additionalProperties: MutableMap = mutableMapOf() + + @JvmSynthetic + internal fun from(commit: Commit) = apply { + this.id = commit.id + this.authorId = commit.authorId + this.dateCreated = commit.dateCreated + this.fileSize = commit.fileSize + this.message = commit.message + this.mlModelId = commit.mlModelId + this.validationDatasetId = commit.validationDatasetId + this.trainingDatasetId = commit.trainingDatasetId + this.storageUri = commit.storageUri + this.gitCommitSha = commit.gitCommitSha + this.gitCommitRef = commit.gitCommitRef + this.gitCommitUrl = commit.gitCommitUrl + additionalProperties(commit.additionalProperties) + } + + /** The commit id. */ + @JsonProperty("id") fun id(id: String) = apply { this.id = id } + + /** The author id of the commit. */ + @JsonProperty("authorId") + fun authorId(authorId: String) = apply { this.authorId = authorId } + + /** The commit creation date. */ + @JsonProperty("dateCreated") + fun dateCreated(dateCreated: OffsetDateTime) = apply { this.dateCreated = dateCreated } + + /** The size of the commit bundle in bytes. */ + @JsonProperty("fileSize") + fun fileSize(fileSize: Long) = apply { this.fileSize = fileSize } + + /** The commit message. */ + @JsonProperty("message") fun message(message: String) = apply { this.message = message } + + /** The model id. */ + @JsonProperty("mlModelId") + fun mlModelId(mlModelId: String) = apply { this.mlModelId = mlModelId } + + /** The validation dataset id. */ + @JsonProperty("validationDatasetId") + fun validationDatasetId(validationDatasetId: String) = apply { + this.validationDatasetId = validationDatasetId + } + + /** The training dataset id. */ + @JsonProperty("trainingDatasetId") + fun trainingDatasetId(trainingDatasetId: String) = apply { + this.trainingDatasetId = trainingDatasetId + } + + /** The storage URI where the commit bundle is stored. */ + @JsonProperty("storageUri") + fun storageUri(storageUri: String) = apply { this.storageUri = storageUri } + + /** The SHA of the corresponding git commit. */ + @JsonProperty("gitCommitSha") + fun gitCommitSha(gitCommitSha: Long) = apply { this.gitCommitSha = gitCommitSha } + + /** The ref of the corresponding git commit. */ + @JsonProperty("gitCommitRef") + fun gitCommitRef(gitCommitRef: String) = apply { this.gitCommitRef = gitCommitRef } + + /** The URL of the corresponding git commit. */ + @JsonProperty("gitCommitUrl") + fun gitCommitUrl(gitCommitUrl: String) = apply { this.gitCommitUrl = gitCommitUrl } + + fun additionalProperties(additionalProperties: Map) = apply { + this.additionalProperties.clear() + this.additionalProperties.putAll(additionalProperties) + } + + @JsonAnySetter + fun putAdditionalProperty(key: String, value: JsonValue) = apply { + this.additionalProperties.put(key, value) + } + + fun putAllAdditionalProperties(additionalProperties: Map) = apply { + this.additionalProperties.putAll(additionalProperties) + } + + fun build(): Commit = + Commit( + checkNotNull(id) { "`id` is required but was not set" }, + checkNotNull(authorId) { "`authorId` is required but was not set" }, + dateCreated, + fileSize, + checkNotNull(message) { "`message` is required but was not set" }, + mlModelId, + validationDatasetId, + trainingDatasetId, + checkNotNull(storageUri) { "`storageUri` is required but was not set" }, + gitCommitSha, + gitCommitRef, + gitCommitUrl, + additionalProperties.toImmutable(), + ) + } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is Commit && this.id == other.id && this.authorId == other.authorId && this.dateCreated == other.dateCreated && this.fileSize == other.fileSize && this.message == other.message && this.mlModelId == other.mlModelId && this.validationDatasetId == other.validationDatasetId && this.trainingDatasetId == other.trainingDatasetId && this.storageUri == other.storageUri && this.gitCommitSha == other.gitCommitSha && this.gitCommitRef == other.gitCommitRef && this.gitCommitUrl == other.gitCommitUrl && this.additionalProperties == other.additionalProperties /* spotless:on */ + } + + private var hashCode: Int = 0 + + override fun hashCode(): Int { + if (hashCode == 0) { + hashCode = /* spotless:off */ Objects.hash(id, authorId, dateCreated, fileSize, message, mlModelId, validationDatasetId, trainingDatasetId, storageUri, gitCommitSha, gitCommitRef, gitCommitUrl, additionalProperties) /* spotless:on */ + } + return hashCode + } + + override fun toString() = + "Commit{id=$id, authorId=$authorId, dateCreated=$dateCreated, fileSize=$fileSize, message=$message, mlModelId=$mlModelId, validationDatasetId=$validationDatasetId, trainingDatasetId=$trainingDatasetId, storageUri=$storageUri, gitCommitSha=$gitCommitSha, gitCommitRef=$gitCommitRef, gitCommitUrl=$gitCommitUrl, additionalProperties=$additionalProperties}" + } + + class Status + @JsonCreator + private constructor( + private val value: JsonField, + ) : Enum { + + @com.fasterxml.jackson.annotation.JsonValue fun _value(): JsonField = value + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is Status && this.value == other.value /* spotless:on */ + } + + override fun hashCode() = value.hashCode() + + override fun toString() = value.toString() + + companion object { + + @JvmField val QUEUED = Status(JsonField.of("queued")) + + @JvmField val RUNNING = Status(JsonField.of("running")) + + @JvmField val PAUSED = Status(JsonField.of("paused")) + + @JvmField val FAILED = Status(JsonField.of("failed")) + + @JvmField val COMPLETED = Status(JsonField.of("completed")) + + @JvmField val UNKNOWN = Status(JsonField.of("unknown")) + + @JvmStatic fun of(value: String) = Status(JsonField.of(value)) + } + + enum class Known { + QUEUED, + RUNNING, + PAUSED, + FAILED, + COMPLETED, + UNKNOWN, + } + + enum class Value { + QUEUED, + RUNNING, + PAUSED, + FAILED, + COMPLETED, + UNKNOWN, + _UNKNOWN, + } + + fun value(): Value = + when (this) { + QUEUED -> Value.QUEUED + RUNNING -> Value.RUNNING + PAUSED -> Value.PAUSED + FAILED -> Value.FAILED + COMPLETED -> Value.COMPLETED + UNKNOWN -> Value.UNKNOWN + else -> Value._UNKNOWN + } + + fun known(): Known = + when (this) { + QUEUED -> Known.QUEUED + RUNNING -> Known.RUNNING + PAUSED -> Known.PAUSED + FAILED -> Known.FAILED + COMPLETED -> Known.COMPLETED + UNKNOWN -> Known.UNKNOWN + else -> throw OpenlayerInvalidDataException("Unknown Status: $value") + } + + fun asString(): String = _value().asStringOrThrow() + } + + @JsonDeserialize(builder = Links.Builder::class) + @NoAutoDetect + class Links + private constructor( + private val app: String?, + private val additionalProperties: Map, + ) { + + @JsonProperty("app") fun app(): String? = app + + @JsonAnyGetter + @ExcludeMissing + fun _additionalProperties(): Map = additionalProperties + + fun toBuilder() = Builder().from(this) + + companion object { + + @JvmStatic fun builder() = Builder() + } + + class Builder { + + private var app: String? = null + private var additionalProperties: MutableMap = mutableMapOf() + + @JvmSynthetic + internal fun from(links: Links) = apply { + this.app = links.app + additionalProperties(links.additionalProperties) + } + + @JsonProperty("app") fun app(app: String) = apply { this.app = app } + + fun additionalProperties(additionalProperties: Map) = apply { + this.additionalProperties.clear() + this.additionalProperties.putAll(additionalProperties) + } + + @JsonAnySetter + fun putAdditionalProperty(key: String, value: JsonValue) = apply { + this.additionalProperties.put(key, value) + } + + fun putAllAdditionalProperties(additionalProperties: Map) = apply { + this.additionalProperties.putAll(additionalProperties) + } + + fun build(): Links = + Links( + checkNotNull(app) { "`app` is required but was not set" }, + additionalProperties.toImmutable() + ) + } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is Links && this.app == other.app && this.additionalProperties == other.additionalProperties /* spotless:on */ + } + + private var hashCode: Int = 0 + + override fun hashCode(): Int { + if (hashCode == 0) { + hashCode = /* spotless:off */ Objects.hash(app, additionalProperties) /* spotless:on */ + } + return hashCode + } + + override fun toString() = "Links{app=$app, additionalProperties=$additionalProperties}" + } +} diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/ProjectCommitCreateResponse.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/ProjectCommitCreateResponse.kt new file mode 100644 index 0000000..2e8ac57 --- /dev/null +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/ProjectCommitCreateResponse.kt @@ -0,0 +1,951 @@ +// File generated from our OpenAPI spec by Stainless. + +package com.openlayer.api.models + +import com.fasterxml.jackson.annotation.JsonAnyGetter +import com.fasterxml.jackson.annotation.JsonAnySetter +import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonProperty +import com.fasterxml.jackson.databind.annotation.JsonDeserialize +import com.openlayer.api.core.Enum +import com.openlayer.api.core.ExcludeMissing +import com.openlayer.api.core.JsonField +import com.openlayer.api.core.JsonMissing +import com.openlayer.api.core.JsonValue +import com.openlayer.api.core.NoAutoDetect +import com.openlayer.api.core.toImmutable +import com.openlayer.api.errors.OpenlayerInvalidDataException +import java.time.OffsetDateTime +import java.util.Objects +import java.util.Optional + +@JsonDeserialize(builder = ProjectCommitCreateResponse.Builder::class) +@NoAutoDetect +class ProjectCommitCreateResponse +private constructor( + private val id: JsonField, + private val dateCreated: JsonField, + private val status: JsonField, + private val statusMessage: JsonField, + private val projectId: JsonField, + private val storageUri: JsonField, + private val commit: JsonField, + private val deploymentStatus: JsonField, + private val mlModelId: JsonField, + private val validationDatasetId: JsonField, + private val trainingDatasetId: JsonField, + private val archived: JsonField, + private val dateArchived: JsonField, + private val passingGoalCount: JsonField, + private val failingGoalCount: JsonField, + private val totalGoalCount: JsonField, + private val links: JsonField, + private val additionalProperties: Map, +) { + + private var validated: Boolean = false + + /** The project version (commit) id. */ + fun id(): String = id.getRequired("id") + + /** The project version (commit) creation date. */ + fun dateCreated(): OffsetDateTime = dateCreated.getRequired("dateCreated") + + /** + * The commit status. Initially, the commit is `queued`, then, it switches to `running`. + * Finally, it can be `paused`, `failed`, or `completed`. + */ + fun status(): Status = status.getRequired("status") + + /** The commit status message. */ + fun statusMessage(): Optional = + Optional.ofNullable(statusMessage.getNullable("statusMessage")) + + /** The project id. */ + fun projectId(): String = projectId.getRequired("projectId") + + /** The storage URI where the commit bundle is stored. */ + fun storageUri(): String = storageUri.getRequired("storageUri") + + /** The details of a commit (project version). */ + fun commit(): Commit = commit.getRequired("commit") + + /** The deployment status associated with the commit's model. */ + fun deploymentStatus(): Optional = + Optional.ofNullable(deploymentStatus.getNullable("deploymentStatus")) + + /** The model id. */ + fun mlModelId(): Optional = Optional.ofNullable(mlModelId.getNullable("mlModelId")) + + /** The validation dataset id. */ + fun validationDatasetId(): Optional = + Optional.ofNullable(validationDatasetId.getNullable("validationDatasetId")) + + /** The training dataset id. */ + fun trainingDatasetId(): Optional = + Optional.ofNullable(trainingDatasetId.getNullable("trainingDatasetId")) + + /** Whether the commit is archived. */ + fun archived(): Optional = Optional.ofNullable(archived.getNullable("archived")) + + /** The commit archive date. */ + fun dateArchived(): Optional = + Optional.ofNullable(dateArchived.getNullable("dateArchived")) + + /** The number of tests that are passing for the commit. */ + fun passingGoalCount(): Long = passingGoalCount.getRequired("passingGoalCount") + + /** The number of tests that are failing for the commit. */ + fun failingGoalCount(): Long = failingGoalCount.getRequired("failingGoalCount") + + /** The total number of tests for the commit. */ + fun totalGoalCount(): Long = totalGoalCount.getRequired("totalGoalCount") + + fun links(): Optional = Optional.ofNullable(links.getNullable("links")) + + /** The project version (commit) id. */ + @JsonProperty("id") @ExcludeMissing fun _id() = id + + /** The project version (commit) creation date. */ + @JsonProperty("dateCreated") @ExcludeMissing fun _dateCreated() = dateCreated + + /** + * The commit status. Initially, the commit is `queued`, then, it switches to `running`. + * Finally, it can be `paused`, `failed`, or `completed`. + */ + @JsonProperty("status") @ExcludeMissing fun _status() = status + + /** The commit status message. */ + @JsonProperty("statusMessage") @ExcludeMissing fun _statusMessage() = statusMessage + + /** The project id. */ + @JsonProperty("projectId") @ExcludeMissing fun _projectId() = projectId + + /** The storage URI where the commit bundle is stored. */ + @JsonProperty("storageUri") @ExcludeMissing fun _storageUri() = storageUri + + /** The details of a commit (project version). */ + @JsonProperty("commit") @ExcludeMissing fun _commit() = commit + + /** The deployment status associated with the commit's model. */ + @JsonProperty("deploymentStatus") @ExcludeMissing fun _deploymentStatus() = deploymentStatus + + /** The model id. */ + @JsonProperty("mlModelId") @ExcludeMissing fun _mlModelId() = mlModelId + + /** The validation dataset id. */ + @JsonProperty("validationDatasetId") + @ExcludeMissing + fun _validationDatasetId() = validationDatasetId + + /** The training dataset id. */ + @JsonProperty("trainingDatasetId") @ExcludeMissing fun _trainingDatasetId() = trainingDatasetId + + /** Whether the commit is archived. */ + @JsonProperty("archived") @ExcludeMissing fun _archived() = archived + + /** The commit archive date. */ + @JsonProperty("dateArchived") @ExcludeMissing fun _dateArchived() = dateArchived + + /** The number of tests that are passing for the commit. */ + @JsonProperty("passingGoalCount") @ExcludeMissing fun _passingGoalCount() = passingGoalCount + + /** The number of tests that are failing for the commit. */ + @JsonProperty("failingGoalCount") @ExcludeMissing fun _failingGoalCount() = failingGoalCount + + /** The total number of tests for the commit. */ + @JsonProperty("totalGoalCount") @ExcludeMissing fun _totalGoalCount() = totalGoalCount + + @JsonProperty("links") @ExcludeMissing fun _links() = links + + @JsonAnyGetter + @ExcludeMissing + fun _additionalProperties(): Map = additionalProperties + + fun validate(): ProjectCommitCreateResponse = apply { + if (!validated) { + id() + dateCreated() + status() + statusMessage() + projectId() + storageUri() + commit().validate() + deploymentStatus() + mlModelId() + validationDatasetId() + trainingDatasetId() + archived() + dateArchived() + passingGoalCount() + failingGoalCount() + totalGoalCount() + links().map { it.validate() } + validated = true + } + } + + fun toBuilder() = Builder().from(this) + + companion object { + + @JvmStatic fun builder() = Builder() + } + + class Builder { + + private var id: JsonField = JsonMissing.of() + private var dateCreated: JsonField = JsonMissing.of() + private var status: JsonField = JsonMissing.of() + private var statusMessage: JsonField = JsonMissing.of() + private var projectId: JsonField = JsonMissing.of() + private var storageUri: JsonField = JsonMissing.of() + private var commit: JsonField = JsonMissing.of() + private var deploymentStatus: JsonField = JsonMissing.of() + private var mlModelId: JsonField = JsonMissing.of() + private var validationDatasetId: JsonField = JsonMissing.of() + private var trainingDatasetId: JsonField = JsonMissing.of() + private var archived: JsonField = JsonMissing.of() + private var dateArchived: JsonField = JsonMissing.of() + private var passingGoalCount: JsonField = JsonMissing.of() + private var failingGoalCount: JsonField = JsonMissing.of() + private var totalGoalCount: JsonField = JsonMissing.of() + private var links: JsonField = JsonMissing.of() + private var additionalProperties: MutableMap = mutableMapOf() + + @JvmSynthetic + internal fun from(projectCommitCreateResponse: ProjectCommitCreateResponse) = apply { + this.id = projectCommitCreateResponse.id + this.dateCreated = projectCommitCreateResponse.dateCreated + this.status = projectCommitCreateResponse.status + this.statusMessage = projectCommitCreateResponse.statusMessage + this.projectId = projectCommitCreateResponse.projectId + this.storageUri = projectCommitCreateResponse.storageUri + this.commit = projectCommitCreateResponse.commit + this.deploymentStatus = projectCommitCreateResponse.deploymentStatus + this.mlModelId = projectCommitCreateResponse.mlModelId + this.validationDatasetId = projectCommitCreateResponse.validationDatasetId + this.trainingDatasetId = projectCommitCreateResponse.trainingDatasetId + this.archived = projectCommitCreateResponse.archived + this.dateArchived = projectCommitCreateResponse.dateArchived + this.passingGoalCount = projectCommitCreateResponse.passingGoalCount + this.failingGoalCount = projectCommitCreateResponse.failingGoalCount + this.totalGoalCount = projectCommitCreateResponse.totalGoalCount + this.links = projectCommitCreateResponse.links + additionalProperties(projectCommitCreateResponse.additionalProperties) + } + + /** The project version (commit) id. */ + fun id(id: String) = id(JsonField.of(id)) + + /** The project version (commit) id. */ + @JsonProperty("id") @ExcludeMissing fun id(id: JsonField) = apply { this.id = id } + + /** The project version (commit) creation date. */ + fun dateCreated(dateCreated: OffsetDateTime) = dateCreated(JsonField.of(dateCreated)) + + /** The project version (commit) creation date. */ + @JsonProperty("dateCreated") + @ExcludeMissing + fun dateCreated(dateCreated: JsonField) = apply { + this.dateCreated = dateCreated + } + + /** + * The commit status. Initially, the commit is `queued`, then, it switches to `running`. + * Finally, it can be `paused`, `failed`, or `completed`. + */ + fun status(status: Status) = status(JsonField.of(status)) + + /** + * The commit status. Initially, the commit is `queued`, then, it switches to `running`. + * Finally, it can be `paused`, `failed`, or `completed`. + */ + @JsonProperty("status") + @ExcludeMissing + fun status(status: JsonField) = apply { this.status = status } + + /** The commit status message. */ + fun statusMessage(statusMessage: String) = statusMessage(JsonField.of(statusMessage)) + + /** The commit status message. */ + @JsonProperty("statusMessage") + @ExcludeMissing + fun statusMessage(statusMessage: JsonField) = apply { + this.statusMessage = statusMessage + } + + /** The project id. */ + fun projectId(projectId: String) = projectId(JsonField.of(projectId)) + + /** The project id. */ + @JsonProperty("projectId") + @ExcludeMissing + fun projectId(projectId: JsonField) = apply { this.projectId = projectId } + + /** The storage URI where the commit bundle is stored. */ + fun storageUri(storageUri: String) = storageUri(JsonField.of(storageUri)) + + /** The storage URI where the commit bundle is stored. */ + @JsonProperty("storageUri") + @ExcludeMissing + fun storageUri(storageUri: JsonField) = apply { this.storageUri = storageUri } + + /** The details of a commit (project version). */ + fun commit(commit: Commit) = commit(JsonField.of(commit)) + + /** The details of a commit (project version). */ + @JsonProperty("commit") + @ExcludeMissing + fun commit(commit: JsonField) = apply { this.commit = commit } + + /** The deployment status associated with the commit's model. */ + fun deploymentStatus(deploymentStatus: String) = + deploymentStatus(JsonField.of(deploymentStatus)) + + /** The deployment status associated with the commit's model. */ + @JsonProperty("deploymentStatus") + @ExcludeMissing + fun deploymentStatus(deploymentStatus: JsonField) = apply { + this.deploymentStatus = deploymentStatus + } + + /** The model id. */ + fun mlModelId(mlModelId: String) = mlModelId(JsonField.of(mlModelId)) + + /** The model id. */ + @JsonProperty("mlModelId") + @ExcludeMissing + fun mlModelId(mlModelId: JsonField) = apply { this.mlModelId = mlModelId } + + /** The validation dataset id. */ + fun validationDatasetId(validationDatasetId: String) = + validationDatasetId(JsonField.of(validationDatasetId)) + + /** The validation dataset id. */ + @JsonProperty("validationDatasetId") + @ExcludeMissing + fun validationDatasetId(validationDatasetId: JsonField) = apply { + this.validationDatasetId = validationDatasetId + } + + /** The training dataset id. */ + fun trainingDatasetId(trainingDatasetId: String) = + trainingDatasetId(JsonField.of(trainingDatasetId)) + + /** The training dataset id. */ + @JsonProperty("trainingDatasetId") + @ExcludeMissing + fun trainingDatasetId(trainingDatasetId: JsonField) = apply { + this.trainingDatasetId = trainingDatasetId + } + + /** Whether the commit is archived. */ + fun archived(archived: Boolean) = archived(JsonField.of(archived)) + + /** Whether the commit is archived. */ + @JsonProperty("archived") + @ExcludeMissing + fun archived(archived: JsonField) = apply { this.archived = archived } + + /** The commit archive date. */ + fun dateArchived(dateArchived: OffsetDateTime) = dateArchived(JsonField.of(dateArchived)) + + /** The commit archive date. */ + @JsonProperty("dateArchived") + @ExcludeMissing + fun dateArchived(dateArchived: JsonField) = apply { + this.dateArchived = dateArchived + } + + /** The number of tests that are passing for the commit. */ + fun passingGoalCount(passingGoalCount: Long) = + passingGoalCount(JsonField.of(passingGoalCount)) + + /** The number of tests that are passing for the commit. */ + @JsonProperty("passingGoalCount") + @ExcludeMissing + fun passingGoalCount(passingGoalCount: JsonField) = apply { + this.passingGoalCount = passingGoalCount + } + + /** The number of tests that are failing for the commit. */ + fun failingGoalCount(failingGoalCount: Long) = + failingGoalCount(JsonField.of(failingGoalCount)) + + /** The number of tests that are failing for the commit. */ + @JsonProperty("failingGoalCount") + @ExcludeMissing + fun failingGoalCount(failingGoalCount: JsonField) = apply { + this.failingGoalCount = failingGoalCount + } + + /** The total number of tests for the commit. */ + fun totalGoalCount(totalGoalCount: Long) = totalGoalCount(JsonField.of(totalGoalCount)) + + /** The total number of tests for the commit. */ + @JsonProperty("totalGoalCount") + @ExcludeMissing + fun totalGoalCount(totalGoalCount: JsonField) = apply { + this.totalGoalCount = totalGoalCount + } + + fun links(links: Links) = links(JsonField.of(links)) + + @JsonProperty("links") + @ExcludeMissing + fun links(links: JsonField) = apply { this.links = links } + + fun additionalProperties(additionalProperties: Map) = apply { + this.additionalProperties.clear() + this.additionalProperties.putAll(additionalProperties) + } + + @JsonAnySetter + fun putAdditionalProperty(key: String, value: JsonValue) = apply { + this.additionalProperties.put(key, value) + } + + fun putAllAdditionalProperties(additionalProperties: Map) = apply { + this.additionalProperties.putAll(additionalProperties) + } + + fun build(): ProjectCommitCreateResponse = + ProjectCommitCreateResponse( + id, + dateCreated, + status, + statusMessage, + projectId, + storageUri, + commit, + deploymentStatus, + mlModelId, + validationDatasetId, + trainingDatasetId, + archived, + dateArchived, + passingGoalCount, + failingGoalCount, + totalGoalCount, + links, + additionalProperties.toImmutable(), + ) + } + + /** The details of a commit (project version). */ + @JsonDeserialize(builder = Commit.Builder::class) + @NoAutoDetect + class Commit + private constructor( + private val id: JsonField, + private val authorId: JsonField, + private val dateCreated: JsonField, + private val fileSize: JsonField, + private val message: JsonField, + private val mlModelId: JsonField, + private val validationDatasetId: JsonField, + private val trainingDatasetId: JsonField, + private val storageUri: JsonField, + private val gitCommitSha: JsonField, + private val gitCommitRef: JsonField, + private val gitCommitUrl: JsonField, + private val additionalProperties: Map, + ) { + + private var validated: Boolean = false + + /** The commit id. */ + fun id(): String = id.getRequired("id") + + /** The author id of the commit. */ + fun authorId(): String = authorId.getRequired("authorId") + + /** The commit creation date. */ + fun dateCreated(): Optional = + Optional.ofNullable(dateCreated.getNullable("dateCreated")) + + /** The size of the commit bundle in bytes. */ + fun fileSize(): Optional = Optional.ofNullable(fileSize.getNullable("fileSize")) + + /** The commit message. */ + fun message(): String = message.getRequired("message") + + /** The model id. */ + fun mlModelId(): Optional = Optional.ofNullable(mlModelId.getNullable("mlModelId")) + + /** The validation dataset id. */ + fun validationDatasetId(): Optional = + Optional.ofNullable(validationDatasetId.getNullable("validationDatasetId")) + + /** The training dataset id. */ + fun trainingDatasetId(): Optional = + Optional.ofNullable(trainingDatasetId.getNullable("trainingDatasetId")) + + /** The storage URI where the commit bundle is stored. */ + fun storageUri(): String = storageUri.getRequired("storageUri") + + /** The SHA of the corresponding git commit. */ + fun gitCommitSha(): Optional = + Optional.ofNullable(gitCommitSha.getNullable("gitCommitSha")) + + /** The ref of the corresponding git commit. */ + fun gitCommitRef(): Optional = + Optional.ofNullable(gitCommitRef.getNullable("gitCommitRef")) + + /** The URL of the corresponding git commit. */ + fun gitCommitUrl(): Optional = + Optional.ofNullable(gitCommitUrl.getNullable("gitCommitUrl")) + + /** The commit id. */ + @JsonProperty("id") @ExcludeMissing fun _id() = id + + /** The author id of the commit. */ + @JsonProperty("authorId") @ExcludeMissing fun _authorId() = authorId + + /** The commit creation date. */ + @JsonProperty("dateCreated") @ExcludeMissing fun _dateCreated() = dateCreated + + /** The size of the commit bundle in bytes. */ + @JsonProperty("fileSize") @ExcludeMissing fun _fileSize() = fileSize + + /** The commit message. */ + @JsonProperty("message") @ExcludeMissing fun _message() = message + + /** The model id. */ + @JsonProperty("mlModelId") @ExcludeMissing fun _mlModelId() = mlModelId + + /** The validation dataset id. */ + @JsonProperty("validationDatasetId") + @ExcludeMissing + fun _validationDatasetId() = validationDatasetId + + /** The training dataset id. */ + @JsonProperty("trainingDatasetId") + @ExcludeMissing + fun _trainingDatasetId() = trainingDatasetId + + /** The storage URI where the commit bundle is stored. */ + @JsonProperty("storageUri") @ExcludeMissing fun _storageUri() = storageUri + + /** The SHA of the corresponding git commit. */ + @JsonProperty("gitCommitSha") @ExcludeMissing fun _gitCommitSha() = gitCommitSha + + /** The ref of the corresponding git commit. */ + @JsonProperty("gitCommitRef") @ExcludeMissing fun _gitCommitRef() = gitCommitRef + + /** The URL of the corresponding git commit. */ + @JsonProperty("gitCommitUrl") @ExcludeMissing fun _gitCommitUrl() = gitCommitUrl + + @JsonAnyGetter + @ExcludeMissing + fun _additionalProperties(): Map = additionalProperties + + fun validate(): Commit = apply { + if (!validated) { + id() + authorId() + dateCreated() + fileSize() + message() + mlModelId() + validationDatasetId() + trainingDatasetId() + storageUri() + gitCommitSha() + gitCommitRef() + gitCommitUrl() + validated = true + } + } + + fun toBuilder() = Builder().from(this) + + companion object { + + @JvmStatic fun builder() = Builder() + } + + class Builder { + + private var id: JsonField = JsonMissing.of() + private var authorId: JsonField = JsonMissing.of() + private var dateCreated: JsonField = JsonMissing.of() + private var fileSize: JsonField = JsonMissing.of() + private var message: JsonField = JsonMissing.of() + private var mlModelId: JsonField = JsonMissing.of() + private var validationDatasetId: JsonField = JsonMissing.of() + private var trainingDatasetId: JsonField = JsonMissing.of() + private var storageUri: JsonField = JsonMissing.of() + private var gitCommitSha: JsonField = JsonMissing.of() + private var gitCommitRef: JsonField = JsonMissing.of() + private var gitCommitUrl: JsonField = JsonMissing.of() + private var additionalProperties: MutableMap = mutableMapOf() + + @JvmSynthetic + internal fun from(commit: Commit) = apply { + this.id = commit.id + this.authorId = commit.authorId + this.dateCreated = commit.dateCreated + this.fileSize = commit.fileSize + this.message = commit.message + this.mlModelId = commit.mlModelId + this.validationDatasetId = commit.validationDatasetId + this.trainingDatasetId = commit.trainingDatasetId + this.storageUri = commit.storageUri + this.gitCommitSha = commit.gitCommitSha + this.gitCommitRef = commit.gitCommitRef + this.gitCommitUrl = commit.gitCommitUrl + additionalProperties(commit.additionalProperties) + } + + /** The commit id. */ + fun id(id: String) = id(JsonField.of(id)) + + /** The commit id. */ + @JsonProperty("id") + @ExcludeMissing + fun id(id: JsonField) = apply { this.id = id } + + /** The author id of the commit. */ + fun authorId(authorId: String) = authorId(JsonField.of(authorId)) + + /** The author id of the commit. */ + @JsonProperty("authorId") + @ExcludeMissing + fun authorId(authorId: JsonField) = apply { this.authorId = authorId } + + /** The commit creation date. */ + fun dateCreated(dateCreated: OffsetDateTime) = dateCreated(JsonField.of(dateCreated)) + + /** The commit creation date. */ + @JsonProperty("dateCreated") + @ExcludeMissing + fun dateCreated(dateCreated: JsonField) = apply { + this.dateCreated = dateCreated + } + + /** The size of the commit bundle in bytes. */ + fun fileSize(fileSize: Long) = fileSize(JsonField.of(fileSize)) + + /** The size of the commit bundle in bytes. */ + @JsonProperty("fileSize") + @ExcludeMissing + fun fileSize(fileSize: JsonField) = apply { this.fileSize = fileSize } + + /** The commit message. */ + fun message(message: String) = message(JsonField.of(message)) + + /** The commit message. */ + @JsonProperty("message") + @ExcludeMissing + fun message(message: JsonField) = apply { this.message = message } + + /** The model id. */ + fun mlModelId(mlModelId: String) = mlModelId(JsonField.of(mlModelId)) + + /** The model id. */ + @JsonProperty("mlModelId") + @ExcludeMissing + fun mlModelId(mlModelId: JsonField) = apply { this.mlModelId = mlModelId } + + /** The validation dataset id. */ + fun validationDatasetId(validationDatasetId: String) = + validationDatasetId(JsonField.of(validationDatasetId)) + + /** The validation dataset id. */ + @JsonProperty("validationDatasetId") + @ExcludeMissing + fun validationDatasetId(validationDatasetId: JsonField) = apply { + this.validationDatasetId = validationDatasetId + } + + /** The training dataset id. */ + fun trainingDatasetId(trainingDatasetId: String) = + trainingDatasetId(JsonField.of(trainingDatasetId)) + + /** The training dataset id. */ + @JsonProperty("trainingDatasetId") + @ExcludeMissing + fun trainingDatasetId(trainingDatasetId: JsonField) = apply { + this.trainingDatasetId = trainingDatasetId + } + + /** The storage URI where the commit bundle is stored. */ + fun storageUri(storageUri: String) = storageUri(JsonField.of(storageUri)) + + /** The storage URI where the commit bundle is stored. */ + @JsonProperty("storageUri") + @ExcludeMissing + fun storageUri(storageUri: JsonField) = apply { this.storageUri = storageUri } + + /** The SHA of the corresponding git commit. */ + fun gitCommitSha(gitCommitSha: Long) = gitCommitSha(JsonField.of(gitCommitSha)) + + /** The SHA of the corresponding git commit. */ + @JsonProperty("gitCommitSha") + @ExcludeMissing + fun gitCommitSha(gitCommitSha: JsonField) = apply { + this.gitCommitSha = gitCommitSha + } + + /** The ref of the corresponding git commit. */ + fun gitCommitRef(gitCommitRef: String) = gitCommitRef(JsonField.of(gitCommitRef)) + + /** The ref of the corresponding git commit. */ + @JsonProperty("gitCommitRef") + @ExcludeMissing + fun gitCommitRef(gitCommitRef: JsonField) = apply { + this.gitCommitRef = gitCommitRef + } + + /** The URL of the corresponding git commit. */ + fun gitCommitUrl(gitCommitUrl: String) = gitCommitUrl(JsonField.of(gitCommitUrl)) + + /** The URL of the corresponding git commit. */ + @JsonProperty("gitCommitUrl") + @ExcludeMissing + fun gitCommitUrl(gitCommitUrl: JsonField) = apply { + this.gitCommitUrl = gitCommitUrl + } + + fun additionalProperties(additionalProperties: Map) = apply { + this.additionalProperties.clear() + this.additionalProperties.putAll(additionalProperties) + } + + @JsonAnySetter + fun putAdditionalProperty(key: String, value: JsonValue) = apply { + this.additionalProperties.put(key, value) + } + + fun putAllAdditionalProperties(additionalProperties: Map) = apply { + this.additionalProperties.putAll(additionalProperties) + } + + fun build(): Commit = + Commit( + id, + authorId, + dateCreated, + fileSize, + message, + mlModelId, + validationDatasetId, + trainingDatasetId, + storageUri, + gitCommitSha, + gitCommitRef, + gitCommitUrl, + additionalProperties.toImmutable(), + ) + } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is Commit && this.id == other.id && this.authorId == other.authorId && this.dateCreated == other.dateCreated && this.fileSize == other.fileSize && this.message == other.message && this.mlModelId == other.mlModelId && this.validationDatasetId == other.validationDatasetId && this.trainingDatasetId == other.trainingDatasetId && this.storageUri == other.storageUri && this.gitCommitSha == other.gitCommitSha && this.gitCommitRef == other.gitCommitRef && this.gitCommitUrl == other.gitCommitUrl && this.additionalProperties == other.additionalProperties /* spotless:on */ + } + + private var hashCode: Int = 0 + + override fun hashCode(): Int { + if (hashCode == 0) { + hashCode = /* spotless:off */ Objects.hash(id, authorId, dateCreated, fileSize, message, mlModelId, validationDatasetId, trainingDatasetId, storageUri, gitCommitSha, gitCommitRef, gitCommitUrl, additionalProperties) /* spotless:on */ + } + return hashCode + } + + override fun toString() = + "Commit{id=$id, authorId=$authorId, dateCreated=$dateCreated, fileSize=$fileSize, message=$message, mlModelId=$mlModelId, validationDatasetId=$validationDatasetId, trainingDatasetId=$trainingDatasetId, storageUri=$storageUri, gitCommitSha=$gitCommitSha, gitCommitRef=$gitCommitRef, gitCommitUrl=$gitCommitUrl, additionalProperties=$additionalProperties}" + } + + class Status + @JsonCreator + private constructor( + private val value: JsonField, + ) : Enum { + + @com.fasterxml.jackson.annotation.JsonValue fun _value(): JsonField = value + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is Status && this.value == other.value /* spotless:on */ + } + + override fun hashCode() = value.hashCode() + + override fun toString() = value.toString() + + companion object { + + @JvmField val QUEUED = Status(JsonField.of("queued")) + + @JvmField val RUNNING = Status(JsonField.of("running")) + + @JvmField val PAUSED = Status(JsonField.of("paused")) + + @JvmField val FAILED = Status(JsonField.of("failed")) + + @JvmField val COMPLETED = Status(JsonField.of("completed")) + + @JvmField val UNKNOWN = Status(JsonField.of("unknown")) + + @JvmStatic fun of(value: String) = Status(JsonField.of(value)) + } + + enum class Known { + QUEUED, + RUNNING, + PAUSED, + FAILED, + COMPLETED, + UNKNOWN, + } + + enum class Value { + QUEUED, + RUNNING, + PAUSED, + FAILED, + COMPLETED, + UNKNOWN, + _UNKNOWN, + } + + fun value(): Value = + when (this) { + QUEUED -> Value.QUEUED + RUNNING -> Value.RUNNING + PAUSED -> Value.PAUSED + FAILED -> Value.FAILED + COMPLETED -> Value.COMPLETED + UNKNOWN -> Value.UNKNOWN + else -> Value._UNKNOWN + } + + fun known(): Known = + when (this) { + QUEUED -> Known.QUEUED + RUNNING -> Known.RUNNING + PAUSED -> Known.PAUSED + FAILED -> Known.FAILED + COMPLETED -> Known.COMPLETED + UNKNOWN -> Known.UNKNOWN + else -> throw OpenlayerInvalidDataException("Unknown Status: $value") + } + + fun asString(): String = _value().asStringOrThrow() + } + + @JsonDeserialize(builder = Links.Builder::class) + @NoAutoDetect + class Links + private constructor( + private val app: JsonField, + private val additionalProperties: Map, + ) { + + private var validated: Boolean = false + + fun app(): String = app.getRequired("app") + + @JsonProperty("app") @ExcludeMissing fun _app() = app + + @JsonAnyGetter + @ExcludeMissing + fun _additionalProperties(): Map = additionalProperties + + fun validate(): Links = apply { + if (!validated) { + app() + validated = true + } + } + + fun toBuilder() = Builder().from(this) + + companion object { + + @JvmStatic fun builder() = Builder() + } + + class Builder { + + private var app: JsonField = JsonMissing.of() + private var additionalProperties: MutableMap = mutableMapOf() + + @JvmSynthetic + internal fun from(links: Links) = apply { + this.app = links.app + additionalProperties(links.additionalProperties) + } + + fun app(app: String) = app(JsonField.of(app)) + + @JsonProperty("app") + @ExcludeMissing + fun app(app: JsonField) = apply { this.app = app } + + fun additionalProperties(additionalProperties: Map) = apply { + this.additionalProperties.clear() + this.additionalProperties.putAll(additionalProperties) + } + + @JsonAnySetter + fun putAdditionalProperty(key: String, value: JsonValue) = apply { + this.additionalProperties.put(key, value) + } + + fun putAllAdditionalProperties(additionalProperties: Map) = apply { + this.additionalProperties.putAll(additionalProperties) + } + + fun build(): Links = Links(app, additionalProperties.toImmutable()) + } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is Links && this.app == other.app && this.additionalProperties == other.additionalProperties /* spotless:on */ + } + + private var hashCode: Int = 0 + + override fun hashCode(): Int { + if (hashCode == 0) { + hashCode = /* spotless:off */ Objects.hash(app, additionalProperties) /* spotless:on */ + } + return hashCode + } + + override fun toString() = "Links{app=$app, additionalProperties=$additionalProperties}" + } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is ProjectCommitCreateResponse && this.id == other.id && this.dateCreated == other.dateCreated && this.status == other.status && this.statusMessage == other.statusMessage && this.projectId == other.projectId && this.storageUri == other.storageUri && this.commit == other.commit && this.deploymentStatus == other.deploymentStatus && this.mlModelId == other.mlModelId && this.validationDatasetId == other.validationDatasetId && this.trainingDatasetId == other.trainingDatasetId && this.archived == other.archived && this.dateArchived == other.dateArchived && this.passingGoalCount == other.passingGoalCount && this.failingGoalCount == other.failingGoalCount && this.totalGoalCount == other.totalGoalCount && this.links == other.links && this.additionalProperties == other.additionalProperties /* spotless:on */ + } + + private var hashCode: Int = 0 + + override fun hashCode(): Int { + if (hashCode == 0) { + hashCode = /* spotless:off */ Objects.hash(id, dateCreated, status, statusMessage, projectId, storageUri, commit, deploymentStatus, mlModelId, validationDatasetId, trainingDatasetId, archived, dateArchived, passingGoalCount, failingGoalCount, totalGoalCount, links, additionalProperties) /* spotless:on */ + } + return hashCode + } + + override fun toString() = + "ProjectCommitCreateResponse{id=$id, dateCreated=$dateCreated, status=$status, statusMessage=$statusMessage, projectId=$projectId, storageUri=$storageUri, commit=$commit, deploymentStatus=$deploymentStatus, mlModelId=$mlModelId, validationDatasetId=$validationDatasetId, trainingDatasetId=$trainingDatasetId, archived=$archived, dateArchived=$dateArchived, passingGoalCount=$passingGoalCount, failingGoalCount=$failingGoalCount, totalGoalCount=$totalGoalCount, links=$links, additionalProperties=$additionalProperties}" +} diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/ProjectCommitListParams.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/ProjectCommitListParams.kt index 70182de..e8fa829 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/ProjectCommitListParams.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/ProjectCommitListParams.kt @@ -3,7 +3,8 @@ package com.openlayer.api.models import com.openlayer.api.core.NoAutoDetect -import com.openlayer.api.core.toUnmodifiable +import com.openlayer.api.core.http.Headers +import com.openlayer.api.core.http.QueryParams import com.openlayer.api.models.* import java.util.Objects import java.util.Optional @@ -13,8 +14,8 @@ constructor( private val projectId: String, private val page: Long?, private val perPage: Long?, - private val additionalQueryParams: Map>, - private val additionalHeaders: Map>, + private val additionalHeaders: Headers, + private val additionalQueryParams: QueryParams, ) { fun projectId(): String = projectId @@ -23,17 +24,17 @@ constructor( fun perPage(): Optional = Optional.ofNullable(perPage) + @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + @JvmSynthetic - internal fun getQueryParams(): Map> { - val params = mutableMapOf>() - this.page?.let { params.put("page", listOf(it.toString())) } - this.perPage?.let { params.put("perPage", listOf(it.toString())) } - params.putAll(additionalQueryParams) - return params.toUnmodifiable() + internal fun getQueryParams(): QueryParams { + val queryParams = QueryParams.builder() + this.page?.let { queryParams.put("page", listOf(it.toString())) } + this.perPage?.let { queryParams.put("perPage", listOf(it.toString())) } + queryParams.putAll(additionalQueryParams) + return queryParams.build() } - @JvmSynthetic internal fun getHeaders(): Map> = additionalHeaders - fun getPathParam(index: Int): String { return when (index) { 0 -> projectId @@ -41,35 +42,24 @@ constructor( } } - fun _additionalQueryParams(): Map> = additionalQueryParams + fun _additionalHeaders(): Headers = additionalHeaders - fun _additionalHeaders(): Map> = additionalHeaders + fun _additionalQueryParams(): QueryParams = additionalQueryParams override fun equals(other: Any?): Boolean { if (this === other) { return true } - return other is ProjectCommitListParams && - this.projectId == other.projectId && - this.page == other.page && - this.perPage == other.perPage && - this.additionalQueryParams == other.additionalQueryParams && - this.additionalHeaders == other.additionalHeaders + return /* spotless:off */ other is ProjectCommitListParams && this.projectId == other.projectId && this.page == other.page && this.perPage == other.perPage && this.additionalHeaders == other.additionalHeaders && this.additionalQueryParams == other.additionalQueryParams /* spotless:on */ } override fun hashCode(): Int { - return Objects.hash( - projectId, - page, - perPage, - additionalQueryParams, - additionalHeaders, - ) + return /* spotless:off */ Objects.hash(projectId, page, perPage, additionalHeaders, additionalQueryParams) /* spotless:on */ } override fun toString() = - "ProjectCommitListParams{projectId=$projectId, page=$page, perPage=$perPage, additionalQueryParams=$additionalQueryParams, additionalHeaders=$additionalHeaders}" + "ProjectCommitListParams{projectId=$projectId, page=$page, perPage=$perPage, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams}" fun toBuilder() = Builder().from(this) @@ -84,16 +74,16 @@ constructor( private var projectId: String? = null private var page: Long? = null private var perPage: Long? = null - private var additionalQueryParams: MutableMap> = mutableMapOf() - private var additionalHeaders: MutableMap> = mutableMapOf() + private var additionalHeaders: Headers.Builder = Headers.builder() + private var additionalQueryParams: QueryParams.Builder = QueryParams.builder() @JvmSynthetic internal fun from(projectCommitListParams: ProjectCommitListParams) = apply { this.projectId = projectCommitListParams.projectId this.page = projectCommitListParams.page this.perPage = projectCommitListParams.perPage - additionalQueryParams(projectCommitListParams.additionalQueryParams) additionalHeaders(projectCommitListParams.additionalHeaders) + additionalQueryParams(projectCommitListParams.additionalQueryParams) } fun projectId(projectId: String) = apply { this.projectId = projectId } @@ -104,53 +94,111 @@ constructor( /** Maximum number of items to return per page. */ fun perPage(perPage: Long) = apply { this.perPage = perPage } - fun additionalQueryParams(additionalQueryParams: Map>) = apply { - this.additionalQueryParams.clear() - putAllQueryParams(additionalQueryParams) + fun additionalHeaders(additionalHeaders: Headers) = apply { + this.additionalHeaders.clear() + putAllAdditionalHeaders(additionalHeaders) } - fun putQueryParam(name: String, value: String) = apply { - this.additionalQueryParams.getOrPut(name) { mutableListOf() }.add(value) + fun additionalHeaders(additionalHeaders: Map>) = apply { + this.additionalHeaders.clear() + putAllAdditionalHeaders(additionalHeaders) } - fun putQueryParams(name: String, values: Iterable) = apply { - this.additionalQueryParams.getOrPut(name) { mutableListOf() }.addAll(values) + fun putAdditionalHeader(name: String, value: String) = apply { + additionalHeaders.put(name, value) } - fun putAllQueryParams(additionalQueryParams: Map>) = apply { - additionalQueryParams.forEach(this::putQueryParams) + fun putAdditionalHeaders(name: String, values: Iterable) = apply { + additionalHeaders.put(name, values) } - fun removeQueryParam(name: String) = apply { - this.additionalQueryParams.put(name, mutableListOf()) + fun putAllAdditionalHeaders(additionalHeaders: Headers) = apply { + this.additionalHeaders.putAll(additionalHeaders) } - fun additionalHeaders(additionalHeaders: Map>) = apply { - this.additionalHeaders.clear() - putAllHeaders(additionalHeaders) + fun putAllAdditionalHeaders(additionalHeaders: Map>) = apply { + this.additionalHeaders.putAll(additionalHeaders) } - fun putHeader(name: String, value: String) = apply { - this.additionalHeaders.getOrPut(name) { mutableListOf() }.add(value) + fun replaceAdditionalHeaders(name: String, value: String) = apply { + additionalHeaders.replace(name, value) } - fun putHeaders(name: String, values: Iterable) = apply { - this.additionalHeaders.getOrPut(name) { mutableListOf() }.addAll(values) + fun replaceAdditionalHeaders(name: String, values: Iterable) = apply { + additionalHeaders.replace(name, values) } - fun putAllHeaders(additionalHeaders: Map>) = apply { - additionalHeaders.forEach(this::putHeaders) + fun replaceAllAdditionalHeaders(additionalHeaders: Headers) = apply { + this.additionalHeaders.replaceAll(additionalHeaders) } - fun removeHeader(name: String) = apply { this.additionalHeaders.put(name, mutableListOf()) } + fun replaceAllAdditionalHeaders(additionalHeaders: Map>) = apply { + this.additionalHeaders.replaceAll(additionalHeaders) + } + + fun removeAdditionalHeaders(name: String) = apply { additionalHeaders.remove(name) } + + fun removeAllAdditionalHeaders(names: Set) = apply { + additionalHeaders.removeAll(names) + } + + fun additionalQueryParams(additionalQueryParams: QueryParams) = apply { + this.additionalQueryParams.clear() + putAllAdditionalQueryParams(additionalQueryParams) + } + + fun additionalQueryParams(additionalQueryParams: Map>) = apply { + this.additionalQueryParams.clear() + putAllAdditionalQueryParams(additionalQueryParams) + } + + fun putAdditionalQueryParam(key: String, value: String) = apply { + additionalQueryParams.put(key, value) + } + + fun putAdditionalQueryParams(key: String, values: Iterable) = apply { + additionalQueryParams.put(key, values) + } + + fun putAllAdditionalQueryParams(additionalQueryParams: QueryParams) = apply { + this.additionalQueryParams.putAll(additionalQueryParams) + } + + fun putAllAdditionalQueryParams(additionalQueryParams: Map>) = + apply { + this.additionalQueryParams.putAll(additionalQueryParams) + } + + fun replaceAdditionalQueryParams(key: String, value: String) = apply { + additionalQueryParams.replace(key, value) + } + + fun replaceAdditionalQueryParams(key: String, values: Iterable) = apply { + additionalQueryParams.replace(key, values) + } + + fun replaceAllAdditionalQueryParams(additionalQueryParams: QueryParams) = apply { + this.additionalQueryParams.replaceAll(additionalQueryParams) + } + + fun replaceAllAdditionalQueryParams(additionalQueryParams: Map>) = + apply { + this.additionalQueryParams.replaceAll(additionalQueryParams) + } + + fun removeAdditionalQueryParams(key: String) = apply { additionalQueryParams.remove(key) } + + fun removeAllAdditionalQueryParams(keys: Set) = apply { + additionalQueryParams.removeAll(keys) + } fun build(): ProjectCommitListParams = ProjectCommitListParams( checkNotNull(projectId) { "`projectId` is required but was not set" }, page, perPage, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), + additionalHeaders.build(), + additionalQueryParams.build(), ) } } diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/ProjectCommitListResponse.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/ProjectCommitListResponse.kt index ee04f83..8d5edb0 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/ProjectCommitListResponse.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/ProjectCommitListResponse.kt @@ -13,7 +13,7 @@ import com.openlayer.api.core.JsonField import com.openlayer.api.core.JsonMissing import com.openlayer.api.core.JsonValue import com.openlayer.api.core.NoAutoDetect -import com.openlayer.api.core.toUnmodifiable +import com.openlayer.api.core.toImmutable import com.openlayer.api.errors.OpenlayerInvalidDataException import java.time.OffsetDateTime import java.util.Objects @@ -29,8 +29,6 @@ private constructor( private var validated: Boolean = false - private var hashCode: Int = 0 - fun items(): List = items.getRequired("items") @JsonProperty("items") @ExcludeMissing fun _items() = items @@ -48,26 +46,6 @@ private constructor( fun toBuilder() = Builder().from(this) - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return other is ProjectCommitListResponse && - this.items == other.items && - this.additionalProperties == other.additionalProperties - } - - override fun hashCode(): Int { - if (hashCode == 0) { - hashCode = Objects.hash(items, additionalProperties) - } - return hashCode - } - - override fun toString() = - "ProjectCommitListResponse{items=$items, additionalProperties=$additionalProperties}" - companion object { @JvmStatic fun builder() = Builder() @@ -106,8 +84,8 @@ private constructor( fun build(): ProjectCommitListResponse = ProjectCommitListResponse( - items.map { it.toUnmodifiable() }, - additionalProperties.toUnmodifiable() + items.map { it.toImmutable() }, + additionalProperties.toImmutable() ) } @@ -137,8 +115,6 @@ private constructor( private var validated: Boolean = false - private var hashCode: Int = 0 - /** The project version (commit) id. */ fun id(): String = id.getRequired("id") @@ -283,62 +259,6 @@ private constructor( fun toBuilder() = Builder().from(this) - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return other is Item && - this.id == other.id && - this.dateCreated == other.dateCreated && - this.status == other.status && - this.statusMessage == other.statusMessage && - this.projectId == other.projectId && - this.storageUri == other.storageUri && - this.commit == other.commit && - this.deploymentStatus == other.deploymentStatus && - this.mlModelId == other.mlModelId && - this.validationDatasetId == other.validationDatasetId && - this.trainingDatasetId == other.trainingDatasetId && - this.archived == other.archived && - this.dateArchived == other.dateArchived && - this.passingGoalCount == other.passingGoalCount && - this.failingGoalCount == other.failingGoalCount && - this.totalGoalCount == other.totalGoalCount && - this.links == other.links && - this.additionalProperties == other.additionalProperties - } - - override fun hashCode(): Int { - if (hashCode == 0) { - hashCode = - Objects.hash( - id, - dateCreated, - status, - statusMessage, - projectId, - storageUri, - commit, - deploymentStatus, - mlModelId, - validationDatasetId, - trainingDatasetId, - archived, - dateArchived, - passingGoalCount, - failingGoalCount, - totalGoalCount, - links, - additionalProperties, - ) - } - return hashCode - } - - override fun toString() = - "Item{id=$id, dateCreated=$dateCreated, status=$status, statusMessage=$statusMessage, projectId=$projectId, storageUri=$storageUri, commit=$commit, deploymentStatus=$deploymentStatus, mlModelId=$mlModelId, validationDatasetId=$validationDatasetId, trainingDatasetId=$trainingDatasetId, archived=$archived, dateArchived=$dateArchived, passingGoalCount=$passingGoalCount, failingGoalCount=$failingGoalCount, totalGoalCount=$totalGoalCount, links=$links, additionalProperties=$additionalProperties}" - companion object { @JvmStatic fun builder() = Builder() @@ -584,7 +504,7 @@ private constructor( failingGoalCount, totalGoalCount, links, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -610,8 +530,6 @@ private constructor( private var validated: Boolean = false - private var hashCode: Int = 0 - /** The commit id. */ fun id(): String = id.getRequired("id") @@ -719,52 +637,6 @@ private constructor( fun toBuilder() = Builder().from(this) - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return other is Commit && - this.id == other.id && - this.authorId == other.authorId && - this.dateCreated == other.dateCreated && - this.fileSize == other.fileSize && - this.message == other.message && - this.mlModelId == other.mlModelId && - this.validationDatasetId == other.validationDatasetId && - this.trainingDatasetId == other.trainingDatasetId && - this.storageUri == other.storageUri && - this.gitCommitSha == other.gitCommitSha && - this.gitCommitRef == other.gitCommitRef && - this.gitCommitUrl == other.gitCommitUrl && - this.additionalProperties == other.additionalProperties - } - - override fun hashCode(): Int { - if (hashCode == 0) { - hashCode = - Objects.hash( - id, - authorId, - dateCreated, - fileSize, - message, - mlModelId, - validationDatasetId, - trainingDatasetId, - storageUri, - gitCommitSha, - gitCommitRef, - gitCommitUrl, - additionalProperties, - ) - } - return hashCode - } - - override fun toString() = - "Commit{id=$id, authorId=$authorId, dateCreated=$dateCreated, fileSize=$fileSize, message=$message, mlModelId=$mlModelId, validationDatasetId=$validationDatasetId, trainingDatasetId=$trainingDatasetId, storageUri=$storageUri, gitCommitSha=$gitCommitSha, gitCommitRef=$gitCommitRef, gitCommitUrl=$gitCommitUrl, additionalProperties=$additionalProperties}" - companion object { @JvmStatic fun builder() = Builder() @@ -945,9 +817,29 @@ private constructor( gitCommitSha, gitCommitRef, gitCommitUrl, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is Commit && this.id == other.id && this.authorId == other.authorId && this.dateCreated == other.dateCreated && this.fileSize == other.fileSize && this.message == other.message && this.mlModelId == other.mlModelId && this.validationDatasetId == other.validationDatasetId && this.trainingDatasetId == other.trainingDatasetId && this.storageUri == other.storageUri && this.gitCommitSha == other.gitCommitSha && this.gitCommitRef == other.gitCommitRef && this.gitCommitUrl == other.gitCommitUrl && this.additionalProperties == other.additionalProperties /* spotless:on */ + } + + private var hashCode: Int = 0 + + override fun hashCode(): Int { + if (hashCode == 0) { + hashCode = /* spotless:off */ Objects.hash(id, authorId, dateCreated, fileSize, message, mlModelId, validationDatasetId, trainingDatasetId, storageUri, gitCommitSha, gitCommitRef, gitCommitUrl, additionalProperties) /* spotless:on */ + } + return hashCode + } + + override fun toString() = + "Commit{id=$id, authorId=$authorId, dateCreated=$dateCreated, fileSize=$fileSize, message=$message, mlModelId=$mlModelId, validationDatasetId=$validationDatasetId, trainingDatasetId=$trainingDatasetId, storageUri=$storageUri, gitCommitSha=$gitCommitSha, gitCommitRef=$gitCommitRef, gitCommitUrl=$gitCommitUrl, additionalProperties=$additionalProperties}" } class Status @@ -963,7 +855,7 @@ private constructor( return true } - return other is Status && this.value == other.value + return /* spotless:off */ other is Status && this.value == other.value /* spotless:on */ } override fun hashCode() = value.hashCode() @@ -1041,8 +933,6 @@ private constructor( private var validated: Boolean = false - private var hashCode: Int = 0 - fun app(): String = app.getRequired("app") @JsonProperty("app") @ExcludeMissing fun _app() = app @@ -1060,25 +950,6 @@ private constructor( fun toBuilder() = Builder().from(this) - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return other is Links && - this.app == other.app && - this.additionalProperties == other.additionalProperties - } - - override fun hashCode(): Int { - if (hashCode == 0) { - hashCode = Objects.hash(app, additionalProperties) - } - return hashCode - } - - override fun toString() = "Links{app=$app, additionalProperties=$additionalProperties}" - companion object { @JvmStatic fun builder() = Builder() @@ -1116,8 +987,67 @@ private constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): Links = Links(app, additionalProperties.toUnmodifiable()) + fun build(): Links = Links(app, additionalProperties.toImmutable()) + } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is Links && this.app == other.app && this.additionalProperties == other.additionalProperties /* spotless:on */ + } + + private var hashCode: Int = 0 + + override fun hashCode(): Int { + if (hashCode == 0) { + hashCode = /* spotless:off */ Objects.hash(app, additionalProperties) /* spotless:on */ + } + return hashCode + } + + override fun toString() = "Links{app=$app, additionalProperties=$additionalProperties}" + } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true } + + return /* spotless:off */ other is Item && this.id == other.id && this.dateCreated == other.dateCreated && this.status == other.status && this.statusMessage == other.statusMessage && this.projectId == other.projectId && this.storageUri == other.storageUri && this.commit == other.commit && this.deploymentStatus == other.deploymentStatus && this.mlModelId == other.mlModelId && this.validationDatasetId == other.validationDatasetId && this.trainingDatasetId == other.trainingDatasetId && this.archived == other.archived && this.dateArchived == other.dateArchived && this.passingGoalCount == other.passingGoalCount && this.failingGoalCount == other.failingGoalCount && this.totalGoalCount == other.totalGoalCount && this.links == other.links && this.additionalProperties == other.additionalProperties /* spotless:on */ } + + private var hashCode: Int = 0 + + override fun hashCode(): Int { + if (hashCode == 0) { + hashCode = /* spotless:off */ Objects.hash(id, dateCreated, status, statusMessage, projectId, storageUri, commit, deploymentStatus, mlModelId, validationDatasetId, trainingDatasetId, archived, dateArchived, passingGoalCount, failingGoalCount, totalGoalCount, links, additionalProperties) /* spotless:on */ + } + return hashCode + } + + override fun toString() = + "Item{id=$id, dateCreated=$dateCreated, status=$status, statusMessage=$statusMessage, projectId=$projectId, storageUri=$storageUri, commit=$commit, deploymentStatus=$deploymentStatus, mlModelId=$mlModelId, validationDatasetId=$validationDatasetId, trainingDatasetId=$trainingDatasetId, archived=$archived, dateArchived=$dateArchived, passingGoalCount=$passingGoalCount, failingGoalCount=$failingGoalCount, totalGoalCount=$totalGoalCount, links=$links, additionalProperties=$additionalProperties}" } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is ProjectCommitListResponse && this.items == other.items && this.additionalProperties == other.additionalProperties /* spotless:on */ + } + + private var hashCode: Int = 0 + + override fun hashCode(): Int { + if (hashCode == 0) { + hashCode = /* spotless:off */ Objects.hash(items, additionalProperties) /* spotless:on */ + } + return hashCode + } + + override fun toString() = + "ProjectCommitListResponse{items=$items, additionalProperties=$additionalProperties}" } diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/ProjectCreateParams.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/ProjectCreateParams.kt index 559574f..07714dd 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/ProjectCreateParams.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/ProjectCreateParams.kt @@ -12,7 +12,9 @@ import com.openlayer.api.core.ExcludeMissing import com.openlayer.api.core.JsonField import com.openlayer.api.core.JsonValue import com.openlayer.api.core.NoAutoDetect -import com.openlayer.api.core.toUnmodifiable +import com.openlayer.api.core.http.Headers +import com.openlayer.api.core.http.QueryParams +import com.openlayer.api.core.toImmutable import com.openlayer.api.errors.OpenlayerInvalidDataException import com.openlayer.api.models.* import java.time.OffsetDateTime @@ -24,8 +26,8 @@ constructor( private val name: String, private val taskType: TaskType, private val description: String?, - private val additionalQueryParams: Map>, - private val additionalHeaders: Map>, + private val additionalHeaders: Headers, + private val additionalQueryParams: QueryParams, private val additionalBodyProperties: Map, ) { @@ -45,9 +47,9 @@ constructor( ) } - @JvmSynthetic internal fun getQueryParams(): Map> = additionalQueryParams + @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders - @JvmSynthetic internal fun getHeaders(): Map> = additionalHeaders + @JvmSynthetic internal fun getQueryParams(): QueryParams = additionalQueryParams @JsonDeserialize(builder = ProjectCreateBody.Builder::class) @NoAutoDetect @@ -59,8 +61,6 @@ constructor( private val additionalProperties: Map, ) { - private var hashCode: Int = 0 - /** The project name. */ @JsonProperty("name") fun name(): String? = name @@ -76,34 +76,6 @@ constructor( fun toBuilder() = Builder().from(this) - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return other is ProjectCreateBody && - this.name == other.name && - this.taskType == other.taskType && - this.description == other.description && - this.additionalProperties == other.additionalProperties - } - - override fun hashCode(): Int { - if (hashCode == 0) { - hashCode = - Objects.hash( - name, - taskType, - description, - additionalProperties, - ) - } - return hashCode - } - - override fun toString() = - "ProjectCreateBody{name=$name, taskType=$taskType, description=$description, additionalProperties=$additionalProperties}" - companion object { @JvmStatic fun builder() = Builder() @@ -154,14 +126,34 @@ constructor( checkNotNull(name) { "`name` is required but was not set" }, checkNotNull(taskType) { "`taskType` is required but was not set" }, description, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is ProjectCreateBody && this.name == other.name && this.taskType == other.taskType && this.description == other.description && this.additionalProperties == other.additionalProperties /* spotless:on */ + } + + private var hashCode: Int = 0 + + override fun hashCode(): Int { + if (hashCode == 0) { + hashCode = /* spotless:off */ Objects.hash(name, taskType, description, additionalProperties) /* spotless:on */ + } + return hashCode + } + + override fun toString() = + "ProjectCreateBody{name=$name, taskType=$taskType, description=$description, additionalProperties=$additionalProperties}" } - fun _additionalQueryParams(): Map> = additionalQueryParams + fun _additionalHeaders(): Headers = additionalHeaders - fun _additionalHeaders(): Map> = additionalHeaders + fun _additionalQueryParams(): QueryParams = additionalQueryParams fun _additionalBodyProperties(): Map = additionalBodyProperties @@ -170,28 +162,15 @@ constructor( return true } - return other is ProjectCreateParams && - this.name == other.name && - this.taskType == other.taskType && - this.description == other.description && - this.additionalQueryParams == other.additionalQueryParams && - this.additionalHeaders == other.additionalHeaders && - this.additionalBodyProperties == other.additionalBodyProperties + return /* spotless:off */ other is ProjectCreateParams && this.name == other.name && this.taskType == other.taskType && this.description == other.description && this.additionalHeaders == other.additionalHeaders && this.additionalQueryParams == other.additionalQueryParams && this.additionalBodyProperties == other.additionalBodyProperties /* spotless:on */ } override fun hashCode(): Int { - return Objects.hash( - name, - taskType, - description, - additionalQueryParams, - additionalHeaders, - additionalBodyProperties, - ) + return /* spotless:off */ Objects.hash(name, taskType, description, additionalHeaders, additionalQueryParams, additionalBodyProperties) /* spotless:on */ } override fun toString() = - "ProjectCreateParams{name=$name, taskType=$taskType, description=$description, additionalQueryParams=$additionalQueryParams, additionalHeaders=$additionalHeaders, additionalBodyProperties=$additionalBodyProperties}" + "ProjectCreateParams{name=$name, taskType=$taskType, description=$description, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams, additionalBodyProperties=$additionalBodyProperties}" fun toBuilder() = Builder().from(this) @@ -206,8 +185,8 @@ constructor( private var name: String? = null private var taskType: TaskType? = null private var description: String? = null - private var additionalQueryParams: MutableMap> = mutableMapOf() - private var additionalHeaders: MutableMap> = mutableMapOf() + private var additionalHeaders: Headers.Builder = Headers.builder() + private var additionalQueryParams: QueryParams.Builder = QueryParams.builder() private var additionalBodyProperties: MutableMap = mutableMapOf() @JvmSynthetic @@ -215,8 +194,8 @@ constructor( this.name = projectCreateParams.name this.taskType = projectCreateParams.taskType this.description = projectCreateParams.description - additionalQueryParams(projectCreateParams.additionalQueryParams) additionalHeaders(projectCreateParams.additionalHeaders) + additionalQueryParams(projectCreateParams.additionalQueryParams) additionalBodyProperties(projectCreateParams.additionalBodyProperties) } @@ -229,53 +208,111 @@ constructor( /** The project description. */ fun description(description: String) = apply { this.description = description } - fun additionalQueryParams(additionalQueryParams: Map>) = apply { - this.additionalQueryParams.clear() - putAllQueryParams(additionalQueryParams) + fun additionalHeaders(additionalHeaders: Headers) = apply { + this.additionalHeaders.clear() + putAllAdditionalHeaders(additionalHeaders) } - fun putQueryParam(name: String, value: String) = apply { - this.additionalQueryParams.getOrPut(name) { mutableListOf() }.add(value) + fun additionalHeaders(additionalHeaders: Map>) = apply { + this.additionalHeaders.clear() + putAllAdditionalHeaders(additionalHeaders) } - fun putQueryParams(name: String, values: Iterable) = apply { - this.additionalQueryParams.getOrPut(name) { mutableListOf() }.addAll(values) + fun putAdditionalHeader(name: String, value: String) = apply { + additionalHeaders.put(name, value) } - fun putAllQueryParams(additionalQueryParams: Map>) = apply { - additionalQueryParams.forEach(this::putQueryParams) + fun putAdditionalHeaders(name: String, values: Iterable) = apply { + additionalHeaders.put(name, values) } - fun removeQueryParam(name: String) = apply { - this.additionalQueryParams.put(name, mutableListOf()) + fun putAllAdditionalHeaders(additionalHeaders: Headers) = apply { + this.additionalHeaders.putAll(additionalHeaders) } - fun additionalHeaders(additionalHeaders: Map>) = apply { - this.additionalHeaders.clear() - putAllHeaders(additionalHeaders) + fun putAllAdditionalHeaders(additionalHeaders: Map>) = apply { + this.additionalHeaders.putAll(additionalHeaders) + } + + fun replaceAdditionalHeaders(name: String, value: String) = apply { + additionalHeaders.replace(name, value) + } + + fun replaceAdditionalHeaders(name: String, values: Iterable) = apply { + additionalHeaders.replace(name, values) + } + + fun replaceAllAdditionalHeaders(additionalHeaders: Headers) = apply { + this.additionalHeaders.replaceAll(additionalHeaders) + } + + fun replaceAllAdditionalHeaders(additionalHeaders: Map>) = apply { + this.additionalHeaders.replaceAll(additionalHeaders) + } + + fun removeAdditionalHeaders(name: String) = apply { additionalHeaders.remove(name) } + + fun removeAllAdditionalHeaders(names: Set) = apply { + additionalHeaders.removeAll(names) + } + + fun additionalQueryParams(additionalQueryParams: QueryParams) = apply { + this.additionalQueryParams.clear() + putAllAdditionalQueryParams(additionalQueryParams) } - fun putHeader(name: String, value: String) = apply { - this.additionalHeaders.getOrPut(name) { mutableListOf() }.add(value) + fun additionalQueryParams(additionalQueryParams: Map>) = apply { + this.additionalQueryParams.clear() + putAllAdditionalQueryParams(additionalQueryParams) + } + + fun putAdditionalQueryParam(key: String, value: String) = apply { + additionalQueryParams.put(key, value) } - fun putHeaders(name: String, values: Iterable) = apply { - this.additionalHeaders.getOrPut(name) { mutableListOf() }.addAll(values) + fun putAdditionalQueryParams(key: String, values: Iterable) = apply { + additionalQueryParams.put(key, values) } - fun putAllHeaders(additionalHeaders: Map>) = apply { - additionalHeaders.forEach(this::putHeaders) + fun putAllAdditionalQueryParams(additionalQueryParams: QueryParams) = apply { + this.additionalQueryParams.putAll(additionalQueryParams) } - fun removeHeader(name: String) = apply { this.additionalHeaders.put(name, mutableListOf()) } + fun putAllAdditionalQueryParams(additionalQueryParams: Map>) = + apply { + this.additionalQueryParams.putAll(additionalQueryParams) + } + + fun replaceAdditionalQueryParams(key: String, value: String) = apply { + additionalQueryParams.replace(key, value) + } + + fun replaceAdditionalQueryParams(key: String, values: Iterable) = apply { + additionalQueryParams.replace(key, values) + } + + fun replaceAllAdditionalQueryParams(additionalQueryParams: QueryParams) = apply { + this.additionalQueryParams.replaceAll(additionalQueryParams) + } + + fun replaceAllAdditionalQueryParams(additionalQueryParams: Map>) = + apply { + this.additionalQueryParams.replaceAll(additionalQueryParams) + } + + fun removeAdditionalQueryParams(key: String) = apply { additionalQueryParams.remove(key) } + + fun removeAllAdditionalQueryParams(keys: Set) = apply { + additionalQueryParams.removeAll(keys) + } fun additionalBodyProperties(additionalBodyProperties: Map) = apply { this.additionalBodyProperties.clear() - this.additionalBodyProperties.putAll(additionalBodyProperties) + putAllAdditionalBodyProperties(additionalBodyProperties) } fun putAdditionalBodyProperty(key: String, value: JsonValue) = apply { - this.additionalBodyProperties.put(key, value) + additionalBodyProperties.put(key, value) } fun putAllAdditionalBodyProperties(additionalBodyProperties: Map) = @@ -283,14 +320,22 @@ constructor( this.additionalBodyProperties.putAll(additionalBodyProperties) } + fun removeAdditionalBodyProperty(key: String) = apply { + additionalBodyProperties.remove(key) + } + + fun removeAllAdditionalBodyProperties(keys: Set) = apply { + keys.forEach(::removeAdditionalBodyProperty) + } + fun build(): ProjectCreateParams = ProjectCreateParams( checkNotNull(name) { "`name` is required but was not set" }, checkNotNull(taskType) { "`taskType` is required but was not set" }, description, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + additionalHeaders.build(), + additionalQueryParams.build(), + additionalBodyProperties.toImmutable(), ) } @@ -303,8 +348,6 @@ constructor( private val additionalProperties: Map, ) { - private var hashCode: Int = 0 - @JsonProperty("app") fun app(): String? = app @JsonAnyGetter @@ -313,25 +356,6 @@ constructor( fun toBuilder() = Builder().from(this) - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return other is Links && - this.app == other.app && - this.additionalProperties == other.additionalProperties - } - - override fun hashCode(): Int { - if (hashCode == 0) { - hashCode = Objects.hash(app, additionalProperties) - } - return hashCode - } - - override fun toString() = "Links{app=$app, additionalProperties=$additionalProperties}" - companion object { @JvmStatic fun builder() = Builder() @@ -367,9 +391,28 @@ constructor( fun build(): Links = Links( checkNotNull(app) { "`app` is required but was not set" }, - additionalProperties.toUnmodifiable() + additionalProperties.toImmutable() ) } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is Links && this.app == other.app && this.additionalProperties == other.additionalProperties /* spotless:on */ + } + + private var hashCode: Int = 0 + + override fun hashCode(): Int { + if (hashCode == 0) { + hashCode = /* spotless:off */ Objects.hash(app, additionalProperties) /* spotless:on */ + } + return hashCode + } + + override fun toString() = "Links{app=$app, additionalProperties=$additionalProperties}" } class Source @@ -385,7 +428,7 @@ constructor( return true } - return other is Source && this.value == other.value + return /* spotless:off */ other is Source && this.value == other.value /* spotless:on */ } override fun hashCode() = value.hashCode() @@ -448,7 +491,7 @@ constructor( return true } - return other is TaskType && this.value == other.value + return /* spotless:off */ other is TaskType && this.value == other.value /* spotless:on */ } override fun hashCode() = value.hashCode() @@ -523,8 +566,6 @@ constructor( private val additionalProperties: Map, ) { - private var hashCode: Int = 0 - @JsonProperty("id") fun id(): String? = id @JsonProperty("gitId") fun gitId(): Long? = gitId @@ -555,52 +596,6 @@ constructor( fun toBuilder() = Builder().from(this) - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return other is GitRepo && - this.id == other.id && - this.gitId == other.gitId && - this.dateConnected == other.dateConnected && - this.dateUpdated == other.dateUpdated && - this.branch == other.branch && - this.name == other.name && - this.private_ == other.private_ && - this.slug == other.slug && - this.url == other.url && - this.rootDir == other.rootDir && - this.projectId == other.projectId && - this.gitAccountId == other.gitAccountId && - this.additionalProperties == other.additionalProperties - } - - override fun hashCode(): Int { - if (hashCode == 0) { - hashCode = - Objects.hash( - id, - gitId, - dateConnected, - dateUpdated, - branch, - name, - private_, - slug, - url, - rootDir, - projectId, - gitAccountId, - additionalProperties, - ) - } - return hashCode - } - - override fun toString() = - "GitRepo{id=$id, gitId=$gitId, dateConnected=$dateConnected, dateUpdated=$dateUpdated, branch=$branch, name=$name, private_=$private_, slug=$slug, url=$url, rootDir=$rootDir, projectId=$projectId, gitAccountId=$gitAccountId, additionalProperties=$additionalProperties}" - companion object { @JvmStatic fun builder() = Builder() @@ -698,8 +693,28 @@ constructor( rootDir, checkNotNull(projectId) { "`projectId` is required but was not set" }, checkNotNull(gitAccountId) { "`gitAccountId` is required but was not set" }, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is GitRepo && this.id == other.id && this.gitId == other.gitId && this.dateConnected == other.dateConnected && this.dateUpdated == other.dateUpdated && this.branch == other.branch && this.name == other.name && this.private_ == other.private_ && this.slug == other.slug && this.url == other.url && this.rootDir == other.rootDir && this.projectId == other.projectId && this.gitAccountId == other.gitAccountId && this.additionalProperties == other.additionalProperties /* spotless:on */ + } + + private var hashCode: Int = 0 + + override fun hashCode(): Int { + if (hashCode == 0) { + hashCode = /* spotless:off */ Objects.hash(id, gitId, dateConnected, dateUpdated, branch, name, private_, slug, url, rootDir, projectId, gitAccountId, additionalProperties) /* spotless:on */ + } + return hashCode + } + + override fun toString() = + "GitRepo{id=$id, gitId=$gitId, dateConnected=$dateConnected, dateUpdated=$dateUpdated, branch=$branch, name=$name, private_=$private_, slug=$slug, url=$url, rootDir=$rootDir, projectId=$projectId, gitAccountId=$gitAccountId, additionalProperties=$additionalProperties}" } } diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/ProjectCreateResponse.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/ProjectCreateResponse.kt index eb6afee..1f4629e 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/ProjectCreateResponse.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/ProjectCreateResponse.kt @@ -13,7 +13,7 @@ import com.openlayer.api.core.JsonField import com.openlayer.api.core.JsonMissing import com.openlayer.api.core.JsonValue import com.openlayer.api.core.NoAutoDetect -import com.openlayer.api.core.toUnmodifiable +import com.openlayer.api.core.toImmutable import com.openlayer.api.errors.OpenlayerInvalidDataException import java.time.OffsetDateTime import java.util.Objects @@ -44,8 +44,6 @@ private constructor( private var validated: Boolean = false - private var hashCode: Int = 0 - /** The project id. */ fun id(): String = id.getRequired("id") @@ -177,60 +175,6 @@ private constructor( fun toBuilder() = Builder().from(this) - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return other is ProjectCreateResponse && - this.id == other.id && - this.workspaceId == other.workspaceId && - this.creatorId == other.creatorId && - this.name == other.name && - this.dateCreated == other.dateCreated && - this.dateUpdated == other.dateUpdated && - this.description == other.description && - this.source == other.source && - this.taskType == other.taskType && - this.versionCount == other.versionCount && - this.inferencePipelineCount == other.inferencePipelineCount && - this.goalCount == other.goalCount && - this.developmentGoalCount == other.developmentGoalCount && - this.monitoringGoalCount == other.monitoringGoalCount && - this.links == other.links && - this.gitRepo == other.gitRepo && - this.additionalProperties == other.additionalProperties - } - - override fun hashCode(): Int { - if (hashCode == 0) { - hashCode = - Objects.hash( - id, - workspaceId, - creatorId, - name, - dateCreated, - dateUpdated, - description, - source, - taskType, - versionCount, - inferencePipelineCount, - goalCount, - developmentGoalCount, - monitoringGoalCount, - links, - gitRepo, - additionalProperties, - ) - } - return hashCode - } - - override fun toString() = - "ProjectCreateResponse{id=$id, workspaceId=$workspaceId, creatorId=$creatorId, name=$name, dateCreated=$dateCreated, dateUpdated=$dateUpdated, description=$description, source=$source, taskType=$taskType, versionCount=$versionCount, inferencePipelineCount=$inferencePipelineCount, goalCount=$goalCount, developmentGoalCount=$developmentGoalCount, monitoringGoalCount=$monitoringGoalCount, links=$links, gitRepo=$gitRepo, additionalProperties=$additionalProperties}" - companion object { @JvmStatic fun builder() = Builder() @@ -446,7 +390,7 @@ private constructor( monitoringGoalCount, links, gitRepo, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -461,8 +405,6 @@ private constructor( private var validated: Boolean = false - private var hashCode: Int = 0 - fun app(): String = app.getRequired("app") @JsonProperty("app") @ExcludeMissing fun _app() = app @@ -480,25 +422,6 @@ private constructor( fun toBuilder() = Builder().from(this) - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return other is Links && - this.app == other.app && - this.additionalProperties == other.additionalProperties - } - - override fun hashCode(): Int { - if (hashCode == 0) { - hashCode = Objects.hash(app, additionalProperties) - } - return hashCode - } - - override fun toString() = "Links{app=$app, additionalProperties=$additionalProperties}" - companion object { @JvmStatic fun builder() = Builder() @@ -535,8 +458,27 @@ private constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): Links = Links(app, additionalProperties.toUnmodifiable()) + fun build(): Links = Links(app, additionalProperties.toImmutable()) } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is Links && this.app == other.app && this.additionalProperties == other.additionalProperties /* spotless:on */ + } + + private var hashCode: Int = 0 + + override fun hashCode(): Int { + if (hashCode == 0) { + hashCode = /* spotless:off */ Objects.hash(app, additionalProperties) /* spotless:on */ + } + return hashCode + } + + override fun toString() = "Links{app=$app, additionalProperties=$additionalProperties}" } class Source @@ -552,7 +494,7 @@ private constructor( return true } - return other is Source && this.value == other.value + return /* spotless:off */ other is Source && this.value == other.value /* spotless:on */ } override fun hashCode() = value.hashCode() @@ -615,7 +557,7 @@ private constructor( return true } - return other is TaskType && this.value == other.value + return /* spotless:off */ other is TaskType && this.value == other.value /* spotless:on */ } override fun hashCode() = value.hashCode() @@ -692,8 +634,6 @@ private constructor( private var validated: Boolean = false - private var hashCode: Int = 0 - fun id(): String = id.getRequired("id") fun gitId(): Long = gitId.getRequired("gitId") @@ -766,52 +706,6 @@ private constructor( fun toBuilder() = Builder().from(this) - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return other is GitRepo && - this.id == other.id && - this.gitId == other.gitId && - this.dateConnected == other.dateConnected && - this.dateUpdated == other.dateUpdated && - this.branch == other.branch && - this.name == other.name && - this.private_ == other.private_ && - this.slug == other.slug && - this.url == other.url && - this.rootDir == other.rootDir && - this.projectId == other.projectId && - this.gitAccountId == other.gitAccountId && - this.additionalProperties == other.additionalProperties - } - - override fun hashCode(): Int { - if (hashCode == 0) { - hashCode = - Objects.hash( - id, - gitId, - dateConnected, - dateUpdated, - branch, - name, - private_, - slug, - url, - rootDir, - projectId, - gitAccountId, - additionalProperties, - ) - } - return hashCode - } - - override fun toString() = - "GitRepo{id=$id, gitId=$gitId, dateConnected=$dateConnected, dateUpdated=$dateUpdated, branch=$branch, name=$name, private_=$private_, slug=$slug, url=$url, rootDir=$rootDir, projectId=$projectId, gitAccountId=$gitAccountId, additionalProperties=$additionalProperties}" - companion object { @JvmStatic fun builder() = Builder() @@ -957,8 +851,48 @@ private constructor( rootDir, projectId, gitAccountId, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is GitRepo && this.id == other.id && this.gitId == other.gitId && this.dateConnected == other.dateConnected && this.dateUpdated == other.dateUpdated && this.branch == other.branch && this.name == other.name && this.private_ == other.private_ && this.slug == other.slug && this.url == other.url && this.rootDir == other.rootDir && this.projectId == other.projectId && this.gitAccountId == other.gitAccountId && this.additionalProperties == other.additionalProperties /* spotless:on */ + } + + private var hashCode: Int = 0 + + override fun hashCode(): Int { + if (hashCode == 0) { + hashCode = /* spotless:off */ Objects.hash(id, gitId, dateConnected, dateUpdated, branch, name, private_, slug, url, rootDir, projectId, gitAccountId, additionalProperties) /* spotless:on */ + } + return hashCode + } + + override fun toString() = + "GitRepo{id=$id, gitId=$gitId, dateConnected=$dateConnected, dateUpdated=$dateUpdated, branch=$branch, name=$name, private_=$private_, slug=$slug, url=$url, rootDir=$rootDir, projectId=$projectId, gitAccountId=$gitAccountId, additionalProperties=$additionalProperties}" } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is ProjectCreateResponse && this.id == other.id && this.workspaceId == other.workspaceId && this.creatorId == other.creatorId && this.name == other.name && this.dateCreated == other.dateCreated && this.dateUpdated == other.dateUpdated && this.description == other.description && this.source == other.source && this.taskType == other.taskType && this.versionCount == other.versionCount && this.inferencePipelineCount == other.inferencePipelineCount && this.goalCount == other.goalCount && this.developmentGoalCount == other.developmentGoalCount && this.monitoringGoalCount == other.monitoringGoalCount && this.links == other.links && this.gitRepo == other.gitRepo && this.additionalProperties == other.additionalProperties /* spotless:on */ + } + + private var hashCode: Int = 0 + + override fun hashCode(): Int { + if (hashCode == 0) { + hashCode = /* spotless:off */ Objects.hash(id, workspaceId, creatorId, name, dateCreated, dateUpdated, description, source, taskType, versionCount, inferencePipelineCount, goalCount, developmentGoalCount, monitoringGoalCount, links, gitRepo, additionalProperties) /* spotless:on */ + } + return hashCode + } + + override fun toString() = + "ProjectCreateResponse{id=$id, workspaceId=$workspaceId, creatorId=$creatorId, name=$name, dateCreated=$dateCreated, dateUpdated=$dateUpdated, description=$description, source=$source, taskType=$taskType, versionCount=$versionCount, inferencePipelineCount=$inferencePipelineCount, goalCount=$goalCount, developmentGoalCount=$developmentGoalCount, monitoringGoalCount=$monitoringGoalCount, links=$links, gitRepo=$gitRepo, additionalProperties=$additionalProperties}" } diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/ProjectInferencePipelineCreateParams.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/ProjectInferencePipelineCreateParams.kt index cab7c08..cc96492 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/ProjectInferencePipelineCreateParams.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/ProjectInferencePipelineCreateParams.kt @@ -12,7 +12,9 @@ import com.openlayer.api.core.ExcludeMissing import com.openlayer.api.core.JsonField import com.openlayer.api.core.JsonValue import com.openlayer.api.core.NoAutoDetect -import com.openlayer.api.core.toUnmodifiable +import com.openlayer.api.core.http.Headers +import com.openlayer.api.core.http.QueryParams +import com.openlayer.api.core.toImmutable import com.openlayer.api.errors.OpenlayerInvalidDataException import com.openlayer.api.models.* import java.util.Objects @@ -23,8 +25,8 @@ constructor( private val projectId: String, private val description: String?, private val name: String, - private val additionalQueryParams: Map>, - private val additionalHeaders: Map>, + private val additionalHeaders: Headers, + private val additionalQueryParams: QueryParams, private val additionalBodyProperties: Map, ) { @@ -43,9 +45,9 @@ constructor( ) } - @JvmSynthetic internal fun getQueryParams(): Map> = additionalQueryParams + @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders - @JvmSynthetic internal fun getHeaders(): Map> = additionalHeaders + @JvmSynthetic internal fun getQueryParams(): QueryParams = additionalQueryParams fun getPathParam(index: Int): String { return when (index) { @@ -63,8 +65,6 @@ constructor( private val additionalProperties: Map, ) { - private var hashCode: Int = 0 - /** The inference pipeline description. */ @JsonProperty("description") fun description(): String? = description @@ -77,32 +77,6 @@ constructor( fun toBuilder() = Builder().from(this) - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return other is ProjectInferencePipelineCreateBody && - this.description == other.description && - this.name == other.name && - this.additionalProperties == other.additionalProperties - } - - override fun hashCode(): Int { - if (hashCode == 0) { - hashCode = - Objects.hash( - description, - name, - additionalProperties, - ) - } - return hashCode - } - - override fun toString() = - "ProjectInferencePipelineCreateBody{description=$description, name=$name, additionalProperties=$additionalProperties}" - companion object { @JvmStatic fun builder() = Builder() @@ -148,14 +122,34 @@ constructor( ProjectInferencePipelineCreateBody( description, checkNotNull(name) { "`name` is required but was not set" }, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is ProjectInferencePipelineCreateBody && this.description == other.description && this.name == other.name && this.additionalProperties == other.additionalProperties /* spotless:on */ + } + + private var hashCode: Int = 0 + + override fun hashCode(): Int { + if (hashCode == 0) { + hashCode = /* spotless:off */ Objects.hash(description, name, additionalProperties) /* spotless:on */ + } + return hashCode + } + + override fun toString() = + "ProjectInferencePipelineCreateBody{description=$description, name=$name, additionalProperties=$additionalProperties}" } - fun _additionalQueryParams(): Map> = additionalQueryParams + fun _additionalHeaders(): Headers = additionalHeaders - fun _additionalHeaders(): Map> = additionalHeaders + fun _additionalQueryParams(): QueryParams = additionalQueryParams fun _additionalBodyProperties(): Map = additionalBodyProperties @@ -164,28 +158,15 @@ constructor( return true } - return other is ProjectInferencePipelineCreateParams && - this.projectId == other.projectId && - this.description == other.description && - this.name == other.name && - this.additionalQueryParams == other.additionalQueryParams && - this.additionalHeaders == other.additionalHeaders && - this.additionalBodyProperties == other.additionalBodyProperties + return /* spotless:off */ other is ProjectInferencePipelineCreateParams && this.projectId == other.projectId && this.description == other.description && this.name == other.name && this.additionalHeaders == other.additionalHeaders && this.additionalQueryParams == other.additionalQueryParams && this.additionalBodyProperties == other.additionalBodyProperties /* spotless:on */ } override fun hashCode(): Int { - return Objects.hash( - projectId, - description, - name, - additionalQueryParams, - additionalHeaders, - additionalBodyProperties, - ) + return /* spotless:off */ Objects.hash(projectId, description, name, additionalHeaders, additionalQueryParams, additionalBodyProperties) /* spotless:on */ } override fun toString() = - "ProjectInferencePipelineCreateParams{projectId=$projectId, description=$description, name=$name, additionalQueryParams=$additionalQueryParams, additionalHeaders=$additionalHeaders, additionalBodyProperties=$additionalBodyProperties}" + "ProjectInferencePipelineCreateParams{projectId=$projectId, description=$description, name=$name, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams, additionalBodyProperties=$additionalBodyProperties}" fun toBuilder() = Builder().from(this) @@ -200,8 +181,8 @@ constructor( private var projectId: String? = null private var description: String? = null private var name: String? = null - private var additionalQueryParams: MutableMap> = mutableMapOf() - private var additionalHeaders: MutableMap> = mutableMapOf() + private var additionalHeaders: Headers.Builder = Headers.builder() + private var additionalQueryParams: QueryParams.Builder = QueryParams.builder() private var additionalBodyProperties: MutableMap = mutableMapOf() @JvmSynthetic @@ -211,8 +192,8 @@ constructor( this.projectId = projectInferencePipelineCreateParams.projectId this.description = projectInferencePipelineCreateParams.description this.name = projectInferencePipelineCreateParams.name - additionalQueryParams(projectInferencePipelineCreateParams.additionalQueryParams) additionalHeaders(projectInferencePipelineCreateParams.additionalHeaders) + additionalQueryParams(projectInferencePipelineCreateParams.additionalQueryParams) additionalBodyProperties(projectInferencePipelineCreateParams.additionalBodyProperties) } @@ -224,53 +205,111 @@ constructor( /** The inference pipeline name. */ fun name(name: String) = apply { this.name = name } - fun additionalQueryParams(additionalQueryParams: Map>) = apply { - this.additionalQueryParams.clear() - putAllQueryParams(additionalQueryParams) + fun additionalHeaders(additionalHeaders: Headers) = apply { + this.additionalHeaders.clear() + putAllAdditionalHeaders(additionalHeaders) } - fun putQueryParam(name: String, value: String) = apply { - this.additionalQueryParams.getOrPut(name) { mutableListOf() }.add(value) + fun additionalHeaders(additionalHeaders: Map>) = apply { + this.additionalHeaders.clear() + putAllAdditionalHeaders(additionalHeaders) } - fun putQueryParams(name: String, values: Iterable) = apply { - this.additionalQueryParams.getOrPut(name) { mutableListOf() }.addAll(values) + fun putAdditionalHeader(name: String, value: String) = apply { + additionalHeaders.put(name, value) } - fun putAllQueryParams(additionalQueryParams: Map>) = apply { - additionalQueryParams.forEach(this::putQueryParams) + fun putAdditionalHeaders(name: String, values: Iterable) = apply { + additionalHeaders.put(name, values) } - fun removeQueryParam(name: String) = apply { - this.additionalQueryParams.put(name, mutableListOf()) + fun putAllAdditionalHeaders(additionalHeaders: Headers) = apply { + this.additionalHeaders.putAll(additionalHeaders) } - fun additionalHeaders(additionalHeaders: Map>) = apply { - this.additionalHeaders.clear() - putAllHeaders(additionalHeaders) + fun putAllAdditionalHeaders(additionalHeaders: Map>) = apply { + this.additionalHeaders.putAll(additionalHeaders) + } + + fun replaceAdditionalHeaders(name: String, value: String) = apply { + additionalHeaders.replace(name, value) + } + + fun replaceAdditionalHeaders(name: String, values: Iterable) = apply { + additionalHeaders.replace(name, values) } - fun putHeader(name: String, value: String) = apply { - this.additionalHeaders.getOrPut(name) { mutableListOf() }.add(value) + fun replaceAllAdditionalHeaders(additionalHeaders: Headers) = apply { + this.additionalHeaders.replaceAll(additionalHeaders) } - fun putHeaders(name: String, values: Iterable) = apply { - this.additionalHeaders.getOrPut(name) { mutableListOf() }.addAll(values) + fun replaceAllAdditionalHeaders(additionalHeaders: Map>) = apply { + this.additionalHeaders.replaceAll(additionalHeaders) } - fun putAllHeaders(additionalHeaders: Map>) = apply { - additionalHeaders.forEach(this::putHeaders) + fun removeAdditionalHeaders(name: String) = apply { additionalHeaders.remove(name) } + + fun removeAllAdditionalHeaders(names: Set) = apply { + additionalHeaders.removeAll(names) } - fun removeHeader(name: String) = apply { this.additionalHeaders.put(name, mutableListOf()) } + fun additionalQueryParams(additionalQueryParams: QueryParams) = apply { + this.additionalQueryParams.clear() + putAllAdditionalQueryParams(additionalQueryParams) + } + + fun additionalQueryParams(additionalQueryParams: Map>) = apply { + this.additionalQueryParams.clear() + putAllAdditionalQueryParams(additionalQueryParams) + } + + fun putAdditionalQueryParam(key: String, value: String) = apply { + additionalQueryParams.put(key, value) + } + + fun putAdditionalQueryParams(key: String, values: Iterable) = apply { + additionalQueryParams.put(key, values) + } + + fun putAllAdditionalQueryParams(additionalQueryParams: QueryParams) = apply { + this.additionalQueryParams.putAll(additionalQueryParams) + } + + fun putAllAdditionalQueryParams(additionalQueryParams: Map>) = + apply { + this.additionalQueryParams.putAll(additionalQueryParams) + } + + fun replaceAdditionalQueryParams(key: String, value: String) = apply { + additionalQueryParams.replace(key, value) + } + + fun replaceAdditionalQueryParams(key: String, values: Iterable) = apply { + additionalQueryParams.replace(key, values) + } + + fun replaceAllAdditionalQueryParams(additionalQueryParams: QueryParams) = apply { + this.additionalQueryParams.replaceAll(additionalQueryParams) + } + + fun replaceAllAdditionalQueryParams(additionalQueryParams: Map>) = + apply { + this.additionalQueryParams.replaceAll(additionalQueryParams) + } + + fun removeAdditionalQueryParams(key: String) = apply { additionalQueryParams.remove(key) } + + fun removeAllAdditionalQueryParams(keys: Set) = apply { + additionalQueryParams.removeAll(keys) + } fun additionalBodyProperties(additionalBodyProperties: Map) = apply { this.additionalBodyProperties.clear() - this.additionalBodyProperties.putAll(additionalBodyProperties) + putAllAdditionalBodyProperties(additionalBodyProperties) } fun putAdditionalBodyProperty(key: String, value: JsonValue) = apply { - this.additionalBodyProperties.put(key, value) + additionalBodyProperties.put(key, value) } fun putAllAdditionalBodyProperties(additionalBodyProperties: Map) = @@ -278,14 +317,22 @@ constructor( this.additionalBodyProperties.putAll(additionalBodyProperties) } + fun removeAdditionalBodyProperty(key: String) = apply { + additionalBodyProperties.remove(key) + } + + fun removeAllAdditionalBodyProperties(keys: Set) = apply { + keys.forEach(::removeAdditionalBodyProperty) + } + fun build(): ProjectInferencePipelineCreateParams = ProjectInferencePipelineCreateParams( checkNotNull(projectId) { "`projectId` is required but was not set" }, description, checkNotNull(name) { "`name` is required but was not set" }, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + additionalHeaders.build(), + additionalQueryParams.build(), + additionalBodyProperties.toImmutable(), ) } @@ -297,8 +344,6 @@ constructor( private val additionalProperties: Map, ) { - private var hashCode: Int = 0 - @JsonProperty("app") fun app(): String? = app @JsonAnyGetter @@ -307,25 +352,6 @@ constructor( fun toBuilder() = Builder().from(this) - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return other is Links && - this.app == other.app && - this.additionalProperties == other.additionalProperties - } - - override fun hashCode(): Int { - if (hashCode == 0) { - hashCode = Objects.hash(app, additionalProperties) - } - return hashCode - } - - override fun toString() = "Links{app=$app, additionalProperties=$additionalProperties}" - companion object { @JvmStatic fun builder() = Builder() @@ -361,9 +387,28 @@ constructor( fun build(): Links = Links( checkNotNull(app) { "`app` is required but was not set" }, - additionalProperties.toUnmodifiable() + additionalProperties.toImmutable() ) } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is Links && this.app == other.app && this.additionalProperties == other.additionalProperties /* spotless:on */ + } + + private var hashCode: Int = 0 + + override fun hashCode(): Int { + if (hashCode == 0) { + hashCode = /* spotless:off */ Objects.hash(app, additionalProperties) /* spotless:on */ + } + return hashCode + } + + override fun toString() = "Links{app=$app, additionalProperties=$additionalProperties}" } class Status @@ -379,7 +424,7 @@ constructor( return true } - return other is Status && this.value == other.value + return /* spotless:off */ other is Status && this.value == other.value /* spotless:on */ } override fun hashCode() = value.hashCode() diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/ProjectInferencePipelineCreateResponse.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/ProjectInferencePipelineCreateResponse.kt index acd34bb..55d61de 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/ProjectInferencePipelineCreateResponse.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/ProjectInferencePipelineCreateResponse.kt @@ -13,7 +13,7 @@ import com.openlayer.api.core.JsonField import com.openlayer.api.core.JsonMissing import com.openlayer.api.core.JsonValue import com.openlayer.api.core.NoAutoDetect -import com.openlayer.api.core.toUnmodifiable +import com.openlayer.api.core.toImmutable import com.openlayer.api.errors.OpenlayerInvalidDataException import java.time.OffsetDateTime import java.util.Objects @@ -43,8 +43,6 @@ private constructor( private var validated: Boolean = false - private var hashCode: Int = 0 - /** The inference pipeline id. */ fun id(): String = id.getRequired("id") @@ -169,58 +167,6 @@ private constructor( fun toBuilder() = Builder().from(this) - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return other is ProjectInferencePipelineCreateResponse && - this.id == other.id && - this.projectId == other.projectId && - this.name == other.name && - this.dateCreated == other.dateCreated && - this.dateUpdated == other.dateUpdated && - this.dateLastSampleReceived == other.dateLastSampleReceived && - this.description == other.description && - this.dateLastEvaluated == other.dateLastEvaluated && - this.dateOfNextEvaluation == other.dateOfNextEvaluation && - this.passingGoalCount == other.passingGoalCount && - this.failingGoalCount == other.failingGoalCount && - this.totalGoalCount == other.totalGoalCount && - this.status == other.status && - this.statusMessage == other.statusMessage && - this.links == other.links && - this.additionalProperties == other.additionalProperties - } - - override fun hashCode(): Int { - if (hashCode == 0) { - hashCode = - Objects.hash( - id, - projectId, - name, - dateCreated, - dateUpdated, - dateLastSampleReceived, - description, - dateLastEvaluated, - dateOfNextEvaluation, - passingGoalCount, - failingGoalCount, - totalGoalCount, - status, - statusMessage, - links, - additionalProperties, - ) - } - return hashCode - } - - override fun toString() = - "ProjectInferencePipelineCreateResponse{id=$id, projectId=$projectId, name=$name, dateCreated=$dateCreated, dateUpdated=$dateUpdated, dateLastSampleReceived=$dateLastSampleReceived, description=$description, dateLastEvaluated=$dateLastEvaluated, dateOfNextEvaluation=$dateOfNextEvaluation, passingGoalCount=$passingGoalCount, failingGoalCount=$failingGoalCount, totalGoalCount=$totalGoalCount, status=$status, statusMessage=$statusMessage, links=$links, additionalProperties=$additionalProperties}" - companion object { @JvmStatic fun builder() = Builder() @@ -438,7 +384,7 @@ private constructor( status, statusMessage, links, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -452,8 +398,6 @@ private constructor( private var validated: Boolean = false - private var hashCode: Int = 0 - fun app(): String = app.getRequired("app") @JsonProperty("app") @ExcludeMissing fun _app() = app @@ -471,25 +415,6 @@ private constructor( fun toBuilder() = Builder().from(this) - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return other is Links && - this.app == other.app && - this.additionalProperties == other.additionalProperties - } - - override fun hashCode(): Int { - if (hashCode == 0) { - hashCode = Objects.hash(app, additionalProperties) - } - return hashCode - } - - override fun toString() = "Links{app=$app, additionalProperties=$additionalProperties}" - companion object { @JvmStatic fun builder() = Builder() @@ -526,8 +451,27 @@ private constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): Links = Links(app, additionalProperties.toUnmodifiable()) + fun build(): Links = Links(app, additionalProperties.toImmutable()) } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is Links && this.app == other.app && this.additionalProperties == other.additionalProperties /* spotless:on */ + } + + private var hashCode: Int = 0 + + override fun hashCode(): Int { + if (hashCode == 0) { + hashCode = /* spotless:off */ Objects.hash(app, additionalProperties) /* spotless:on */ + } + return hashCode + } + + override fun toString() = "Links{app=$app, additionalProperties=$additionalProperties}" } class Status @@ -543,7 +487,7 @@ private constructor( return true } - return other is Status && this.value == other.value + return /* spotless:off */ other is Status && this.value == other.value /* spotless:on */ } override fun hashCode() = value.hashCode() @@ -610,4 +554,24 @@ private constructor( fun asString(): String = _value().asStringOrThrow() } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is ProjectInferencePipelineCreateResponse && this.id == other.id && this.projectId == other.projectId && this.name == other.name && this.dateCreated == other.dateCreated && this.dateUpdated == other.dateUpdated && this.dateLastSampleReceived == other.dateLastSampleReceived && this.description == other.description && this.dateLastEvaluated == other.dateLastEvaluated && this.dateOfNextEvaluation == other.dateOfNextEvaluation && this.passingGoalCount == other.passingGoalCount && this.failingGoalCount == other.failingGoalCount && this.totalGoalCount == other.totalGoalCount && this.status == other.status && this.statusMessage == other.statusMessage && this.links == other.links && this.additionalProperties == other.additionalProperties /* spotless:on */ + } + + private var hashCode: Int = 0 + + override fun hashCode(): Int { + if (hashCode == 0) { + hashCode = /* spotless:off */ Objects.hash(id, projectId, name, dateCreated, dateUpdated, dateLastSampleReceived, description, dateLastEvaluated, dateOfNextEvaluation, passingGoalCount, failingGoalCount, totalGoalCount, status, statusMessage, links, additionalProperties) /* spotless:on */ + } + return hashCode + } + + override fun toString() = + "ProjectInferencePipelineCreateResponse{id=$id, projectId=$projectId, name=$name, dateCreated=$dateCreated, dateUpdated=$dateUpdated, dateLastSampleReceived=$dateLastSampleReceived, description=$description, dateLastEvaluated=$dateLastEvaluated, dateOfNextEvaluation=$dateOfNextEvaluation, passingGoalCount=$passingGoalCount, failingGoalCount=$failingGoalCount, totalGoalCount=$totalGoalCount, status=$status, statusMessage=$statusMessage, links=$links, additionalProperties=$additionalProperties}" } diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/ProjectInferencePipelineListParams.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/ProjectInferencePipelineListParams.kt index 44e3b6a..a31fa56 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/ProjectInferencePipelineListParams.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/ProjectInferencePipelineListParams.kt @@ -3,7 +3,8 @@ package com.openlayer.api.models import com.openlayer.api.core.NoAutoDetect -import com.openlayer.api.core.toUnmodifiable +import com.openlayer.api.core.http.Headers +import com.openlayer.api.core.http.QueryParams import com.openlayer.api.models.* import java.util.Objects import java.util.Optional @@ -14,8 +15,8 @@ constructor( private val name: String?, private val page: Long?, private val perPage: Long?, - private val additionalQueryParams: Map>, - private val additionalHeaders: Map>, + private val additionalHeaders: Headers, + private val additionalQueryParams: QueryParams, ) { fun projectId(): String = projectId @@ -26,18 +27,18 @@ constructor( fun perPage(): Optional = Optional.ofNullable(perPage) + @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + @JvmSynthetic - internal fun getQueryParams(): Map> { - val params = mutableMapOf>() - this.name?.let { params.put("name", listOf(it.toString())) } - this.page?.let { params.put("page", listOf(it.toString())) } - this.perPage?.let { params.put("perPage", listOf(it.toString())) } - params.putAll(additionalQueryParams) - return params.toUnmodifiable() + internal fun getQueryParams(): QueryParams { + val queryParams = QueryParams.builder() + this.name?.let { queryParams.put("name", listOf(it.toString())) } + this.page?.let { queryParams.put("page", listOf(it.toString())) } + this.perPage?.let { queryParams.put("perPage", listOf(it.toString())) } + queryParams.putAll(additionalQueryParams) + return queryParams.build() } - @JvmSynthetic internal fun getHeaders(): Map> = additionalHeaders - fun getPathParam(index: Int): String { return when (index) { 0 -> projectId @@ -45,37 +46,24 @@ constructor( } } - fun _additionalQueryParams(): Map> = additionalQueryParams + fun _additionalHeaders(): Headers = additionalHeaders - fun _additionalHeaders(): Map> = additionalHeaders + fun _additionalQueryParams(): QueryParams = additionalQueryParams override fun equals(other: Any?): Boolean { if (this === other) { return true } - return other is ProjectInferencePipelineListParams && - this.projectId == other.projectId && - this.name == other.name && - this.page == other.page && - this.perPage == other.perPage && - this.additionalQueryParams == other.additionalQueryParams && - this.additionalHeaders == other.additionalHeaders + return /* spotless:off */ other is ProjectInferencePipelineListParams && this.projectId == other.projectId && this.name == other.name && this.page == other.page && this.perPage == other.perPage && this.additionalHeaders == other.additionalHeaders && this.additionalQueryParams == other.additionalQueryParams /* spotless:on */ } override fun hashCode(): Int { - return Objects.hash( - projectId, - name, - page, - perPage, - additionalQueryParams, - additionalHeaders, - ) + return /* spotless:off */ Objects.hash(projectId, name, page, perPage, additionalHeaders, additionalQueryParams) /* spotless:on */ } override fun toString() = - "ProjectInferencePipelineListParams{projectId=$projectId, name=$name, page=$page, perPage=$perPage, additionalQueryParams=$additionalQueryParams, additionalHeaders=$additionalHeaders}" + "ProjectInferencePipelineListParams{projectId=$projectId, name=$name, page=$page, perPage=$perPage, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams}" fun toBuilder() = Builder().from(this) @@ -91,8 +79,8 @@ constructor( private var name: String? = null private var page: Long? = null private var perPage: Long? = null - private var additionalQueryParams: MutableMap> = mutableMapOf() - private var additionalHeaders: MutableMap> = mutableMapOf() + private var additionalHeaders: Headers.Builder = Headers.builder() + private var additionalQueryParams: QueryParams.Builder = QueryParams.builder() @JvmSynthetic internal fun from(projectInferencePipelineListParams: ProjectInferencePipelineListParams) = @@ -101,8 +89,8 @@ constructor( this.name = projectInferencePipelineListParams.name this.page = projectInferencePipelineListParams.page this.perPage = projectInferencePipelineListParams.perPage - additionalQueryParams(projectInferencePipelineListParams.additionalQueryParams) additionalHeaders(projectInferencePipelineListParams.additionalHeaders) + additionalQueryParams(projectInferencePipelineListParams.additionalQueryParams) } fun projectId(projectId: String) = apply { this.projectId = projectId } @@ -116,45 +104,103 @@ constructor( /** Maximum number of items to return per page. */ fun perPage(perPage: Long) = apply { this.perPage = perPage } - fun additionalQueryParams(additionalQueryParams: Map>) = apply { - this.additionalQueryParams.clear() - putAllQueryParams(additionalQueryParams) + fun additionalHeaders(additionalHeaders: Headers) = apply { + this.additionalHeaders.clear() + putAllAdditionalHeaders(additionalHeaders) } - fun putQueryParam(name: String, value: String) = apply { - this.additionalQueryParams.getOrPut(name) { mutableListOf() }.add(value) + fun additionalHeaders(additionalHeaders: Map>) = apply { + this.additionalHeaders.clear() + putAllAdditionalHeaders(additionalHeaders) } - fun putQueryParams(name: String, values: Iterable) = apply { - this.additionalQueryParams.getOrPut(name) { mutableListOf() }.addAll(values) + fun putAdditionalHeader(name: String, value: String) = apply { + additionalHeaders.put(name, value) } - fun putAllQueryParams(additionalQueryParams: Map>) = apply { - additionalQueryParams.forEach(this::putQueryParams) + fun putAdditionalHeaders(name: String, values: Iterable) = apply { + additionalHeaders.put(name, values) } - fun removeQueryParam(name: String) = apply { - this.additionalQueryParams.put(name, mutableListOf()) + fun putAllAdditionalHeaders(additionalHeaders: Headers) = apply { + this.additionalHeaders.putAll(additionalHeaders) } - fun additionalHeaders(additionalHeaders: Map>) = apply { - this.additionalHeaders.clear() - putAllHeaders(additionalHeaders) + fun putAllAdditionalHeaders(additionalHeaders: Map>) = apply { + this.additionalHeaders.putAll(additionalHeaders) } - fun putHeader(name: String, value: String) = apply { - this.additionalHeaders.getOrPut(name) { mutableListOf() }.add(value) + fun replaceAdditionalHeaders(name: String, value: String) = apply { + additionalHeaders.replace(name, value) } - fun putHeaders(name: String, values: Iterable) = apply { - this.additionalHeaders.getOrPut(name) { mutableListOf() }.addAll(values) + fun replaceAdditionalHeaders(name: String, values: Iterable) = apply { + additionalHeaders.replace(name, values) } - fun putAllHeaders(additionalHeaders: Map>) = apply { - additionalHeaders.forEach(this::putHeaders) + fun replaceAllAdditionalHeaders(additionalHeaders: Headers) = apply { + this.additionalHeaders.replaceAll(additionalHeaders) + } + + fun replaceAllAdditionalHeaders(additionalHeaders: Map>) = apply { + this.additionalHeaders.replaceAll(additionalHeaders) + } + + fun removeAdditionalHeaders(name: String) = apply { additionalHeaders.remove(name) } + + fun removeAllAdditionalHeaders(names: Set) = apply { + additionalHeaders.removeAll(names) + } + + fun additionalQueryParams(additionalQueryParams: QueryParams) = apply { + this.additionalQueryParams.clear() + putAllAdditionalQueryParams(additionalQueryParams) + } + + fun additionalQueryParams(additionalQueryParams: Map>) = apply { + this.additionalQueryParams.clear() + putAllAdditionalQueryParams(additionalQueryParams) } - fun removeHeader(name: String) = apply { this.additionalHeaders.put(name, mutableListOf()) } + fun putAdditionalQueryParam(key: String, value: String) = apply { + additionalQueryParams.put(key, value) + } + + fun putAdditionalQueryParams(key: String, values: Iterable) = apply { + additionalQueryParams.put(key, values) + } + + fun putAllAdditionalQueryParams(additionalQueryParams: QueryParams) = apply { + this.additionalQueryParams.putAll(additionalQueryParams) + } + + fun putAllAdditionalQueryParams(additionalQueryParams: Map>) = + apply { + this.additionalQueryParams.putAll(additionalQueryParams) + } + + fun replaceAdditionalQueryParams(key: String, value: String) = apply { + additionalQueryParams.replace(key, value) + } + + fun replaceAdditionalQueryParams(key: String, values: Iterable) = apply { + additionalQueryParams.replace(key, values) + } + + fun replaceAllAdditionalQueryParams(additionalQueryParams: QueryParams) = apply { + this.additionalQueryParams.replaceAll(additionalQueryParams) + } + + fun replaceAllAdditionalQueryParams(additionalQueryParams: Map>) = + apply { + this.additionalQueryParams.replaceAll(additionalQueryParams) + } + + fun removeAdditionalQueryParams(key: String) = apply { additionalQueryParams.remove(key) } + + fun removeAllAdditionalQueryParams(keys: Set) = apply { + additionalQueryParams.removeAll(keys) + } fun build(): ProjectInferencePipelineListParams = ProjectInferencePipelineListParams( @@ -162,8 +208,8 @@ constructor( name, page, perPage, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), + additionalHeaders.build(), + additionalQueryParams.build(), ) } } diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/ProjectInferencePipelineListResponse.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/ProjectInferencePipelineListResponse.kt index 7e9850f..7198d6b 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/ProjectInferencePipelineListResponse.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/ProjectInferencePipelineListResponse.kt @@ -13,7 +13,7 @@ import com.openlayer.api.core.JsonField import com.openlayer.api.core.JsonMissing import com.openlayer.api.core.JsonValue import com.openlayer.api.core.NoAutoDetect -import com.openlayer.api.core.toUnmodifiable +import com.openlayer.api.core.toImmutable import com.openlayer.api.errors.OpenlayerInvalidDataException import java.time.OffsetDateTime import java.util.Objects @@ -29,8 +29,6 @@ private constructor( private var validated: Boolean = false - private var hashCode: Int = 0 - fun items(): List = items.getRequired("items") @JsonProperty("items") @ExcludeMissing fun _items() = items @@ -48,26 +46,6 @@ private constructor( fun toBuilder() = Builder().from(this) - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return other is ProjectInferencePipelineListResponse && - this.items == other.items && - this.additionalProperties == other.additionalProperties - } - - override fun hashCode(): Int { - if (hashCode == 0) { - hashCode = Objects.hash(items, additionalProperties) - } - return hashCode - } - - override fun toString() = - "ProjectInferencePipelineListResponse{items=$items, additionalProperties=$additionalProperties}" - companion object { @JvmStatic fun builder() = Builder() @@ -108,8 +86,8 @@ private constructor( fun build(): ProjectInferencePipelineListResponse = ProjectInferencePipelineListResponse( - items.map { it.toUnmodifiable() }, - additionalProperties.toUnmodifiable() + items.map { it.toImmutable() }, + additionalProperties.toImmutable() ) } @@ -137,8 +115,6 @@ private constructor( private var validated: Boolean = false - private var hashCode: Int = 0 - /** The inference pipeline id. */ fun id(): String = id.getRequired("id") @@ -265,58 +241,6 @@ private constructor( fun toBuilder() = Builder().from(this) - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return other is Item && - this.id == other.id && - this.projectId == other.projectId && - this.name == other.name && - this.dateCreated == other.dateCreated && - this.dateUpdated == other.dateUpdated && - this.dateLastSampleReceived == other.dateLastSampleReceived && - this.description == other.description && - this.dateLastEvaluated == other.dateLastEvaluated && - this.dateOfNextEvaluation == other.dateOfNextEvaluation && - this.passingGoalCount == other.passingGoalCount && - this.failingGoalCount == other.failingGoalCount && - this.totalGoalCount == other.totalGoalCount && - this.status == other.status && - this.statusMessage == other.statusMessage && - this.links == other.links && - this.additionalProperties == other.additionalProperties - } - - override fun hashCode(): Int { - if (hashCode == 0) { - hashCode = - Objects.hash( - id, - projectId, - name, - dateCreated, - dateUpdated, - dateLastSampleReceived, - description, - dateLastEvaluated, - dateOfNextEvaluation, - passingGoalCount, - failingGoalCount, - totalGoalCount, - status, - statusMessage, - links, - additionalProperties, - ) - } - return hashCode - } - - override fun toString() = - "Item{id=$id, projectId=$projectId, name=$name, dateCreated=$dateCreated, dateUpdated=$dateUpdated, dateLastSampleReceived=$dateLastSampleReceived, description=$description, dateLastEvaluated=$dateLastEvaluated, dateOfNextEvaluation=$dateOfNextEvaluation, passingGoalCount=$passingGoalCount, failingGoalCount=$failingGoalCount, totalGoalCount=$totalGoalCount, status=$status, statusMessage=$statusMessage, links=$links, additionalProperties=$additionalProperties}" - companion object { @JvmStatic fun builder() = Builder() @@ -535,7 +459,7 @@ private constructor( status, statusMessage, links, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -549,8 +473,6 @@ private constructor( private var validated: Boolean = false - private var hashCode: Int = 0 - fun app(): String = app.getRequired("app") @JsonProperty("app") @ExcludeMissing fun _app() = app @@ -568,25 +490,6 @@ private constructor( fun toBuilder() = Builder().from(this) - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return other is Links && - this.app == other.app && - this.additionalProperties == other.additionalProperties - } - - override fun hashCode(): Int { - if (hashCode == 0) { - hashCode = Objects.hash(app, additionalProperties) - } - return hashCode - } - - override fun toString() = "Links{app=$app, additionalProperties=$additionalProperties}" - companion object { @JvmStatic fun builder() = Builder() @@ -624,8 +527,27 @@ private constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): Links = Links(app, additionalProperties.toUnmodifiable()) + fun build(): Links = Links(app, additionalProperties.toImmutable()) } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is Links && this.app == other.app && this.additionalProperties == other.additionalProperties /* spotless:on */ + } + + private var hashCode: Int = 0 + + override fun hashCode(): Int { + if (hashCode == 0) { + hashCode = /* spotless:off */ Objects.hash(app, additionalProperties) /* spotless:on */ + } + return hashCode + } + + override fun toString() = "Links{app=$app, additionalProperties=$additionalProperties}" } class Status @@ -641,7 +563,7 @@ private constructor( return true } - return other is Status && this.value == other.value + return /* spotless:off */ other is Status && this.value == other.value /* spotless:on */ } override fun hashCode() = value.hashCode() @@ -708,5 +630,45 @@ private constructor( fun asString(): String = _value().asStringOrThrow() } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is Item && this.id == other.id && this.projectId == other.projectId && this.name == other.name && this.dateCreated == other.dateCreated && this.dateUpdated == other.dateUpdated && this.dateLastSampleReceived == other.dateLastSampleReceived && this.description == other.description && this.dateLastEvaluated == other.dateLastEvaluated && this.dateOfNextEvaluation == other.dateOfNextEvaluation && this.passingGoalCount == other.passingGoalCount && this.failingGoalCount == other.failingGoalCount && this.totalGoalCount == other.totalGoalCount && this.status == other.status && this.statusMessage == other.statusMessage && this.links == other.links && this.additionalProperties == other.additionalProperties /* spotless:on */ + } + + private var hashCode: Int = 0 + + override fun hashCode(): Int { + if (hashCode == 0) { + hashCode = /* spotless:off */ Objects.hash(id, projectId, name, dateCreated, dateUpdated, dateLastSampleReceived, description, dateLastEvaluated, dateOfNextEvaluation, passingGoalCount, failingGoalCount, totalGoalCount, status, statusMessage, links, additionalProperties) /* spotless:on */ + } + return hashCode + } + + override fun toString() = + "Item{id=$id, projectId=$projectId, name=$name, dateCreated=$dateCreated, dateUpdated=$dateUpdated, dateLastSampleReceived=$dateLastSampleReceived, description=$description, dateLastEvaluated=$dateLastEvaluated, dateOfNextEvaluation=$dateOfNextEvaluation, passingGoalCount=$passingGoalCount, failingGoalCount=$failingGoalCount, totalGoalCount=$totalGoalCount, status=$status, statusMessage=$statusMessage, links=$links, additionalProperties=$additionalProperties}" + } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is ProjectInferencePipelineListResponse && this.items == other.items && this.additionalProperties == other.additionalProperties /* spotless:on */ } + + private var hashCode: Int = 0 + + override fun hashCode(): Int { + if (hashCode == 0) { + hashCode = /* spotless:off */ Objects.hash(items, additionalProperties) /* spotless:on */ + } + return hashCode + } + + override fun toString() = + "ProjectInferencePipelineListResponse{items=$items, additionalProperties=$additionalProperties}" } diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/ProjectListParams.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/ProjectListParams.kt index ba784ac..549ccf6 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/ProjectListParams.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/ProjectListParams.kt @@ -7,7 +7,8 @@ import com.openlayer.api.core.Enum import com.openlayer.api.core.JsonField import com.openlayer.api.core.JsonValue import com.openlayer.api.core.NoAutoDetect -import com.openlayer.api.core.toUnmodifiable +import com.openlayer.api.core.http.Headers +import com.openlayer.api.core.http.QueryParams import com.openlayer.api.errors.OpenlayerInvalidDataException import com.openlayer.api.models.* import java.util.Objects @@ -19,8 +20,8 @@ constructor( private val page: Long?, private val perPage: Long?, private val taskType: TaskType?, - private val additionalQueryParams: Map>, - private val additionalHeaders: Map>, + private val additionalHeaders: Headers, + private val additionalQueryParams: QueryParams, ) { fun name(): Optional = Optional.ofNullable(name) @@ -31,50 +32,37 @@ constructor( fun taskType(): Optional = Optional.ofNullable(taskType) + @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + @JvmSynthetic - internal fun getQueryParams(): Map> { - val params = mutableMapOf>() - this.name?.let { params.put("name", listOf(it.toString())) } - this.page?.let { params.put("page", listOf(it.toString())) } - this.perPage?.let { params.put("perPage", listOf(it.toString())) } - this.taskType?.let { params.put("taskType", listOf(it.toString())) } - params.putAll(additionalQueryParams) - return params.toUnmodifiable() + internal fun getQueryParams(): QueryParams { + val queryParams = QueryParams.builder() + this.name?.let { queryParams.put("name", listOf(it.toString())) } + this.page?.let { queryParams.put("page", listOf(it.toString())) } + this.perPage?.let { queryParams.put("perPage", listOf(it.toString())) } + this.taskType?.let { queryParams.put("taskType", listOf(it.toString())) } + queryParams.putAll(additionalQueryParams) + return queryParams.build() } - @JvmSynthetic internal fun getHeaders(): Map> = additionalHeaders - - fun _additionalQueryParams(): Map> = additionalQueryParams + fun _additionalHeaders(): Headers = additionalHeaders - fun _additionalHeaders(): Map> = additionalHeaders + fun _additionalQueryParams(): QueryParams = additionalQueryParams override fun equals(other: Any?): Boolean { if (this === other) { return true } - return other is ProjectListParams && - this.name == other.name && - this.page == other.page && - this.perPage == other.perPage && - this.taskType == other.taskType && - this.additionalQueryParams == other.additionalQueryParams && - this.additionalHeaders == other.additionalHeaders + return /* spotless:off */ other is ProjectListParams && this.name == other.name && this.page == other.page && this.perPage == other.perPage && this.taskType == other.taskType && this.additionalHeaders == other.additionalHeaders && this.additionalQueryParams == other.additionalQueryParams /* spotless:on */ } override fun hashCode(): Int { - return Objects.hash( - name, - page, - perPage, - taskType, - additionalQueryParams, - additionalHeaders, - ) + return /* spotless:off */ Objects.hash(name, page, perPage, taskType, additionalHeaders, additionalQueryParams) /* spotless:on */ } override fun toString() = - "ProjectListParams{name=$name, page=$page, perPage=$perPage, taskType=$taskType, additionalQueryParams=$additionalQueryParams, additionalHeaders=$additionalHeaders}" + "ProjectListParams{name=$name, page=$page, perPage=$perPage, taskType=$taskType, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams}" fun toBuilder() = Builder().from(this) @@ -90,8 +78,8 @@ constructor( private var page: Long? = null private var perPage: Long? = null private var taskType: TaskType? = null - private var additionalQueryParams: MutableMap> = mutableMapOf() - private var additionalHeaders: MutableMap> = mutableMapOf() + private var additionalHeaders: Headers.Builder = Headers.builder() + private var additionalQueryParams: QueryParams.Builder = QueryParams.builder() @JvmSynthetic internal fun from(projectListParams: ProjectListParams) = apply { @@ -99,8 +87,8 @@ constructor( this.page = projectListParams.page this.perPage = projectListParams.perPage this.taskType = projectListParams.taskType - additionalQueryParams(projectListParams.additionalQueryParams) additionalHeaders(projectListParams.additionalHeaders) + additionalQueryParams(projectListParams.additionalQueryParams) } /** Filter list of items by project name. */ @@ -115,45 +103,103 @@ constructor( /** Filter list of items by task type. */ fun taskType(taskType: TaskType) = apply { this.taskType = taskType } - fun additionalQueryParams(additionalQueryParams: Map>) = apply { - this.additionalQueryParams.clear() - putAllQueryParams(additionalQueryParams) + fun additionalHeaders(additionalHeaders: Headers) = apply { + this.additionalHeaders.clear() + putAllAdditionalHeaders(additionalHeaders) } - fun putQueryParam(name: String, value: String) = apply { - this.additionalQueryParams.getOrPut(name) { mutableListOf() }.add(value) + fun additionalHeaders(additionalHeaders: Map>) = apply { + this.additionalHeaders.clear() + putAllAdditionalHeaders(additionalHeaders) } - fun putQueryParams(name: String, values: Iterable) = apply { - this.additionalQueryParams.getOrPut(name) { mutableListOf() }.addAll(values) + fun putAdditionalHeader(name: String, value: String) = apply { + additionalHeaders.put(name, value) } - fun putAllQueryParams(additionalQueryParams: Map>) = apply { - additionalQueryParams.forEach(this::putQueryParams) + fun putAdditionalHeaders(name: String, values: Iterable) = apply { + additionalHeaders.put(name, values) } - fun removeQueryParam(name: String) = apply { - this.additionalQueryParams.put(name, mutableListOf()) + fun putAllAdditionalHeaders(additionalHeaders: Headers) = apply { + this.additionalHeaders.putAll(additionalHeaders) } - fun additionalHeaders(additionalHeaders: Map>) = apply { - this.additionalHeaders.clear() - putAllHeaders(additionalHeaders) + fun putAllAdditionalHeaders(additionalHeaders: Map>) = apply { + this.additionalHeaders.putAll(additionalHeaders) } - fun putHeader(name: String, value: String) = apply { - this.additionalHeaders.getOrPut(name) { mutableListOf() }.add(value) + fun replaceAdditionalHeaders(name: String, value: String) = apply { + additionalHeaders.replace(name, value) } - fun putHeaders(name: String, values: Iterable) = apply { - this.additionalHeaders.getOrPut(name) { mutableListOf() }.addAll(values) + fun replaceAdditionalHeaders(name: String, values: Iterable) = apply { + additionalHeaders.replace(name, values) } - fun putAllHeaders(additionalHeaders: Map>) = apply { - additionalHeaders.forEach(this::putHeaders) + fun replaceAllAdditionalHeaders(additionalHeaders: Headers) = apply { + this.additionalHeaders.replaceAll(additionalHeaders) } - fun removeHeader(name: String) = apply { this.additionalHeaders.put(name, mutableListOf()) } + fun replaceAllAdditionalHeaders(additionalHeaders: Map>) = apply { + this.additionalHeaders.replaceAll(additionalHeaders) + } + + fun removeAdditionalHeaders(name: String) = apply { additionalHeaders.remove(name) } + + fun removeAllAdditionalHeaders(names: Set) = apply { + additionalHeaders.removeAll(names) + } + + fun additionalQueryParams(additionalQueryParams: QueryParams) = apply { + this.additionalQueryParams.clear() + putAllAdditionalQueryParams(additionalQueryParams) + } + + fun additionalQueryParams(additionalQueryParams: Map>) = apply { + this.additionalQueryParams.clear() + putAllAdditionalQueryParams(additionalQueryParams) + } + + fun putAdditionalQueryParam(key: String, value: String) = apply { + additionalQueryParams.put(key, value) + } + + fun putAdditionalQueryParams(key: String, values: Iterable) = apply { + additionalQueryParams.put(key, values) + } + + fun putAllAdditionalQueryParams(additionalQueryParams: QueryParams) = apply { + this.additionalQueryParams.putAll(additionalQueryParams) + } + + fun putAllAdditionalQueryParams(additionalQueryParams: Map>) = + apply { + this.additionalQueryParams.putAll(additionalQueryParams) + } + + fun replaceAdditionalQueryParams(key: String, value: String) = apply { + additionalQueryParams.replace(key, value) + } + + fun replaceAdditionalQueryParams(key: String, values: Iterable) = apply { + additionalQueryParams.replace(key, values) + } + + fun replaceAllAdditionalQueryParams(additionalQueryParams: QueryParams) = apply { + this.additionalQueryParams.replaceAll(additionalQueryParams) + } + + fun replaceAllAdditionalQueryParams(additionalQueryParams: Map>) = + apply { + this.additionalQueryParams.replaceAll(additionalQueryParams) + } + + fun removeAdditionalQueryParams(key: String) = apply { additionalQueryParams.remove(key) } + + fun removeAllAdditionalQueryParams(keys: Set) = apply { + additionalQueryParams.removeAll(keys) + } fun build(): ProjectListParams = ProjectListParams( @@ -161,8 +207,8 @@ constructor( page, perPage, taskType, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), + additionalHeaders.build(), + additionalQueryParams.build(), ) } @@ -179,7 +225,7 @@ constructor( return true } - return other is TaskType && this.value == other.value + return /* spotless:off */ other is TaskType && this.value == other.value /* spotless:on */ } override fun hashCode() = value.hashCode() diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/ProjectListResponse.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/ProjectListResponse.kt index 9c9d885..51765d9 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/ProjectListResponse.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/ProjectListResponse.kt @@ -13,7 +13,7 @@ import com.openlayer.api.core.JsonField import com.openlayer.api.core.JsonMissing import com.openlayer.api.core.JsonValue import com.openlayer.api.core.NoAutoDetect -import com.openlayer.api.core.toUnmodifiable +import com.openlayer.api.core.toImmutable import com.openlayer.api.errors.OpenlayerInvalidDataException import java.time.OffsetDateTime import java.util.Objects @@ -29,8 +29,6 @@ private constructor( private var validated: Boolean = false - private var hashCode: Int = 0 - fun items(): List = items.getRequired("items") @JsonProperty("items") @ExcludeMissing fun _items() = items @@ -48,26 +46,6 @@ private constructor( fun toBuilder() = Builder().from(this) - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return other is ProjectListResponse && - this.items == other.items && - this.additionalProperties == other.additionalProperties - } - - override fun hashCode(): Int { - if (hashCode == 0) { - hashCode = Objects.hash(items, additionalProperties) - } - return hashCode - } - - override fun toString() = - "ProjectListResponse{items=$items, additionalProperties=$additionalProperties}" - companion object { @JvmStatic fun builder() = Builder() @@ -105,10 +83,7 @@ private constructor( } fun build(): ProjectListResponse = - ProjectListResponse( - items.map { it.toUnmodifiable() }, - additionalProperties.toUnmodifiable() - ) + ProjectListResponse(items.map { it.toImmutable() }, additionalProperties.toImmutable()) } @JsonDeserialize(builder = Item.Builder::class) @@ -136,8 +111,6 @@ private constructor( private var validated: Boolean = false - private var hashCode: Int = 0 - /** The project id. */ fun id(): String = id.getRequired("id") @@ -269,60 +242,6 @@ private constructor( fun toBuilder() = Builder().from(this) - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return other is Item && - this.id == other.id && - this.workspaceId == other.workspaceId && - this.creatorId == other.creatorId && - this.name == other.name && - this.dateCreated == other.dateCreated && - this.dateUpdated == other.dateUpdated && - this.description == other.description && - this.source == other.source && - this.taskType == other.taskType && - this.versionCount == other.versionCount && - this.inferencePipelineCount == other.inferencePipelineCount && - this.goalCount == other.goalCount && - this.developmentGoalCount == other.developmentGoalCount && - this.monitoringGoalCount == other.monitoringGoalCount && - this.links == other.links && - this.gitRepo == other.gitRepo && - this.additionalProperties == other.additionalProperties - } - - override fun hashCode(): Int { - if (hashCode == 0) { - hashCode = - Objects.hash( - id, - workspaceId, - creatorId, - name, - dateCreated, - dateUpdated, - description, - source, - taskType, - versionCount, - inferencePipelineCount, - goalCount, - developmentGoalCount, - monitoringGoalCount, - links, - gitRepo, - additionalProperties, - ) - } - return hashCode - } - - override fun toString() = - "Item{id=$id, workspaceId=$workspaceId, creatorId=$creatorId, name=$name, dateCreated=$dateCreated, dateUpdated=$dateUpdated, description=$description, source=$source, taskType=$taskType, versionCount=$versionCount, inferencePipelineCount=$inferencePipelineCount, goalCount=$goalCount, developmentGoalCount=$developmentGoalCount, monitoringGoalCount=$monitoringGoalCount, links=$links, gitRepo=$gitRepo, additionalProperties=$additionalProperties}" - companion object { @JvmStatic fun builder() = Builder() @@ -546,7 +465,7 @@ private constructor( monitoringGoalCount, links, gitRepo, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -561,8 +480,6 @@ private constructor( private var validated: Boolean = false - private var hashCode: Int = 0 - fun app(): String = app.getRequired("app") @JsonProperty("app") @ExcludeMissing fun _app() = app @@ -580,25 +497,6 @@ private constructor( fun toBuilder() = Builder().from(this) - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return other is Links && - this.app == other.app && - this.additionalProperties == other.additionalProperties - } - - override fun hashCode(): Int { - if (hashCode == 0) { - hashCode = Objects.hash(app, additionalProperties) - } - return hashCode - } - - override fun toString() = "Links{app=$app, additionalProperties=$additionalProperties}" - companion object { @JvmStatic fun builder() = Builder() @@ -636,8 +534,27 @@ private constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): Links = Links(app, additionalProperties.toUnmodifiable()) + fun build(): Links = Links(app, additionalProperties.toImmutable()) + } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is Links && this.app == other.app && this.additionalProperties == other.additionalProperties /* spotless:on */ } + + private var hashCode: Int = 0 + + override fun hashCode(): Int { + if (hashCode == 0) { + hashCode = /* spotless:off */ Objects.hash(app, additionalProperties) /* spotless:on */ + } + return hashCode + } + + override fun toString() = "Links{app=$app, additionalProperties=$additionalProperties}" } class Source @@ -653,7 +570,7 @@ private constructor( return true } - return other is Source && this.value == other.value + return /* spotless:off */ other is Source && this.value == other.value /* spotless:on */ } override fun hashCode() = value.hashCode() @@ -716,7 +633,7 @@ private constructor( return true } - return other is TaskType && this.value == other.value + return /* spotless:off */ other is TaskType && this.value == other.value /* spotless:on */ } override fun hashCode() = value.hashCode() @@ -794,8 +711,6 @@ private constructor( private var validated: Boolean = false - private var hashCode: Int = 0 - fun id(): String = id.getRequired("id") fun gitId(): Long = gitId.getRequired("gitId") @@ -868,52 +783,6 @@ private constructor( fun toBuilder() = Builder().from(this) - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return other is GitRepo && - this.id == other.id && - this.gitId == other.gitId && - this.dateConnected == other.dateConnected && - this.dateUpdated == other.dateUpdated && - this.branch == other.branch && - this.name == other.name && - this.private_ == other.private_ && - this.slug == other.slug && - this.url == other.url && - this.rootDir == other.rootDir && - this.projectId == other.projectId && - this.gitAccountId == other.gitAccountId && - this.additionalProperties == other.additionalProperties - } - - override fun hashCode(): Int { - if (hashCode == 0) { - hashCode = - Objects.hash( - id, - gitId, - dateConnected, - dateUpdated, - branch, - name, - private_, - slug, - url, - rootDir, - projectId, - gitAccountId, - additionalProperties, - ) - } - return hashCode - } - - override fun toString() = - "GitRepo{id=$id, gitId=$gitId, dateConnected=$dateConnected, dateUpdated=$dateUpdated, branch=$branch, name=$name, private_=$private_, slug=$slug, url=$url, rootDir=$rootDir, projectId=$projectId, gitAccountId=$gitAccountId, additionalProperties=$additionalProperties}" - companion object { @JvmStatic fun builder() = Builder() @@ -1061,9 +930,69 @@ private constructor( rootDir, projectId, gitAccountId, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is GitRepo && this.id == other.id && this.gitId == other.gitId && this.dateConnected == other.dateConnected && this.dateUpdated == other.dateUpdated && this.branch == other.branch && this.name == other.name && this.private_ == other.private_ && this.slug == other.slug && this.url == other.url && this.rootDir == other.rootDir && this.projectId == other.projectId && this.gitAccountId == other.gitAccountId && this.additionalProperties == other.additionalProperties /* spotless:on */ + } + + private var hashCode: Int = 0 + + override fun hashCode(): Int { + if (hashCode == 0) { + hashCode = /* spotless:off */ Objects.hash(id, gitId, dateConnected, dateUpdated, branch, name, private_, slug, url, rootDir, projectId, gitAccountId, additionalProperties) /* spotless:on */ + } + return hashCode + } + + override fun toString() = + "GitRepo{id=$id, gitId=$gitId, dateConnected=$dateConnected, dateUpdated=$dateUpdated, branch=$branch, name=$name, private_=$private_, slug=$slug, url=$url, rootDir=$rootDir, projectId=$projectId, gitAccountId=$gitAccountId, additionalProperties=$additionalProperties}" } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is Item && this.id == other.id && this.workspaceId == other.workspaceId && this.creatorId == other.creatorId && this.name == other.name && this.dateCreated == other.dateCreated && this.dateUpdated == other.dateUpdated && this.description == other.description && this.source == other.source && this.taskType == other.taskType && this.versionCount == other.versionCount && this.inferencePipelineCount == other.inferencePipelineCount && this.goalCount == other.goalCount && this.developmentGoalCount == other.developmentGoalCount && this.monitoringGoalCount == other.monitoringGoalCount && this.links == other.links && this.gitRepo == other.gitRepo && this.additionalProperties == other.additionalProperties /* spotless:on */ + } + + private var hashCode: Int = 0 + + override fun hashCode(): Int { + if (hashCode == 0) { + hashCode = /* spotless:off */ Objects.hash(id, workspaceId, creatorId, name, dateCreated, dateUpdated, description, source, taskType, versionCount, inferencePipelineCount, goalCount, developmentGoalCount, monitoringGoalCount, links, gitRepo, additionalProperties) /* spotless:on */ + } + return hashCode + } + + override fun toString() = + "Item{id=$id, workspaceId=$workspaceId, creatorId=$creatorId, name=$name, dateCreated=$dateCreated, dateUpdated=$dateUpdated, description=$description, source=$source, taskType=$taskType, versionCount=$versionCount, inferencePipelineCount=$inferencePipelineCount, goalCount=$goalCount, developmentGoalCount=$developmentGoalCount, monitoringGoalCount=$monitoringGoalCount, links=$links, gitRepo=$gitRepo, additionalProperties=$additionalProperties}" } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is ProjectListResponse && this.items == other.items && this.additionalProperties == other.additionalProperties /* spotless:on */ + } + + private var hashCode: Int = 0 + + override fun hashCode(): Int { + if (hashCode == 0) { + hashCode = /* spotless:off */ Objects.hash(items, additionalProperties) /* spotless:on */ + } + return hashCode + } + + override fun toString() = + "ProjectListResponse{items=$items, additionalProperties=$additionalProperties}" } diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/StoragePresignedUrlCreateParams.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/StoragePresignedUrlCreateParams.kt index e5085a5..942acb5 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/StoragePresignedUrlCreateParams.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/StoragePresignedUrlCreateParams.kt @@ -4,7 +4,9 @@ package com.openlayer.api.models import com.openlayer.api.core.JsonValue import com.openlayer.api.core.NoAutoDetect -import com.openlayer.api.core.toUnmodifiable +import com.openlayer.api.core.http.Headers +import com.openlayer.api.core.http.QueryParams +import com.openlayer.api.core.toImmutable import com.openlayer.api.models.* import java.util.Objects import java.util.Optional @@ -12,8 +14,8 @@ import java.util.Optional class StoragePresignedUrlCreateParams constructor( private val objectName: String, - private val additionalQueryParams: Map>, - private val additionalHeaders: Map>, + private val additionalHeaders: Headers, + private val additionalQueryParams: QueryParams, private val additionalBodyProperties: Map, ) { @@ -24,19 +26,19 @@ constructor( return Optional.ofNullable(additionalBodyProperties.ifEmpty { null }) } + @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + @JvmSynthetic - internal fun getQueryParams(): Map> { - val params = mutableMapOf>() - this.objectName.let { params.put("objectName", listOf(it.toString())) } - params.putAll(additionalQueryParams) - return params.toUnmodifiable() + internal fun getQueryParams(): QueryParams { + val queryParams = QueryParams.builder() + this.objectName.let { queryParams.put("objectName", listOf(it.toString())) } + queryParams.putAll(additionalQueryParams) + return queryParams.build() } - @JvmSynthetic internal fun getHeaders(): Map> = additionalHeaders - - fun _additionalQueryParams(): Map> = additionalQueryParams + fun _additionalHeaders(): Headers = additionalHeaders - fun _additionalHeaders(): Map> = additionalHeaders + fun _additionalQueryParams(): QueryParams = additionalQueryParams fun _additionalBodyProperties(): Map = additionalBodyProperties @@ -45,24 +47,15 @@ constructor( return true } - return other is StoragePresignedUrlCreateParams && - this.objectName == other.objectName && - this.additionalQueryParams == other.additionalQueryParams && - this.additionalHeaders == other.additionalHeaders && - this.additionalBodyProperties == other.additionalBodyProperties + return /* spotless:off */ other is StoragePresignedUrlCreateParams && this.objectName == other.objectName && this.additionalHeaders == other.additionalHeaders && this.additionalQueryParams == other.additionalQueryParams && this.additionalBodyProperties == other.additionalBodyProperties /* spotless:on */ } override fun hashCode(): Int { - return Objects.hash( - objectName, - additionalQueryParams, - additionalHeaders, - additionalBodyProperties, - ) + return /* spotless:off */ Objects.hash(objectName, additionalHeaders, additionalQueryParams, additionalBodyProperties) /* spotless:on */ } override fun toString() = - "StoragePresignedUrlCreateParams{objectName=$objectName, additionalQueryParams=$additionalQueryParams, additionalHeaders=$additionalHeaders, additionalBodyProperties=$additionalBodyProperties}" + "StoragePresignedUrlCreateParams{objectName=$objectName, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams, additionalBodyProperties=$additionalBodyProperties}" fun toBuilder() = Builder().from(this) @@ -75,69 +68,127 @@ constructor( class Builder { private var objectName: String? = null - private var additionalQueryParams: MutableMap> = mutableMapOf() - private var additionalHeaders: MutableMap> = mutableMapOf() + private var additionalHeaders: Headers.Builder = Headers.builder() + private var additionalQueryParams: QueryParams.Builder = QueryParams.builder() private var additionalBodyProperties: MutableMap = mutableMapOf() @JvmSynthetic internal fun from(storagePresignedUrlCreateParams: StoragePresignedUrlCreateParams) = apply { this.objectName = storagePresignedUrlCreateParams.objectName - additionalQueryParams(storagePresignedUrlCreateParams.additionalQueryParams) additionalHeaders(storagePresignedUrlCreateParams.additionalHeaders) + additionalQueryParams(storagePresignedUrlCreateParams.additionalQueryParams) additionalBodyProperties(storagePresignedUrlCreateParams.additionalBodyProperties) } /** The name of the object. */ fun objectName(objectName: String) = apply { this.objectName = objectName } - fun additionalQueryParams(additionalQueryParams: Map>) = apply { - this.additionalQueryParams.clear() - putAllQueryParams(additionalQueryParams) + fun additionalHeaders(additionalHeaders: Headers) = apply { + this.additionalHeaders.clear() + putAllAdditionalHeaders(additionalHeaders) } - fun putQueryParam(name: String, value: String) = apply { - this.additionalQueryParams.getOrPut(name) { mutableListOf() }.add(value) + fun additionalHeaders(additionalHeaders: Map>) = apply { + this.additionalHeaders.clear() + putAllAdditionalHeaders(additionalHeaders) } - fun putQueryParams(name: String, values: Iterable) = apply { - this.additionalQueryParams.getOrPut(name) { mutableListOf() }.addAll(values) + fun putAdditionalHeader(name: String, value: String) = apply { + additionalHeaders.put(name, value) } - fun putAllQueryParams(additionalQueryParams: Map>) = apply { - additionalQueryParams.forEach(this::putQueryParams) + fun putAdditionalHeaders(name: String, values: Iterable) = apply { + additionalHeaders.put(name, values) } - fun removeQueryParam(name: String) = apply { - this.additionalQueryParams.put(name, mutableListOf()) + fun putAllAdditionalHeaders(additionalHeaders: Headers) = apply { + this.additionalHeaders.putAll(additionalHeaders) } - fun additionalHeaders(additionalHeaders: Map>) = apply { - this.additionalHeaders.clear() - putAllHeaders(additionalHeaders) + fun putAllAdditionalHeaders(additionalHeaders: Map>) = apply { + this.additionalHeaders.putAll(additionalHeaders) + } + + fun replaceAdditionalHeaders(name: String, value: String) = apply { + additionalHeaders.replace(name, value) } - fun putHeader(name: String, value: String) = apply { - this.additionalHeaders.getOrPut(name) { mutableListOf() }.add(value) + fun replaceAdditionalHeaders(name: String, values: Iterable) = apply { + additionalHeaders.replace(name, values) } - fun putHeaders(name: String, values: Iterable) = apply { - this.additionalHeaders.getOrPut(name) { mutableListOf() }.addAll(values) + fun replaceAllAdditionalHeaders(additionalHeaders: Headers) = apply { + this.additionalHeaders.replaceAll(additionalHeaders) } - fun putAllHeaders(additionalHeaders: Map>) = apply { - additionalHeaders.forEach(this::putHeaders) + fun replaceAllAdditionalHeaders(additionalHeaders: Map>) = apply { + this.additionalHeaders.replaceAll(additionalHeaders) } - fun removeHeader(name: String) = apply { this.additionalHeaders.put(name, mutableListOf()) } + fun removeAdditionalHeaders(name: String) = apply { additionalHeaders.remove(name) } + + fun removeAllAdditionalHeaders(names: Set) = apply { + additionalHeaders.removeAll(names) + } + + fun additionalQueryParams(additionalQueryParams: QueryParams) = apply { + this.additionalQueryParams.clear() + putAllAdditionalQueryParams(additionalQueryParams) + } + + fun additionalQueryParams(additionalQueryParams: Map>) = apply { + this.additionalQueryParams.clear() + putAllAdditionalQueryParams(additionalQueryParams) + } + + fun putAdditionalQueryParam(key: String, value: String) = apply { + additionalQueryParams.put(key, value) + } + + fun putAdditionalQueryParams(key: String, values: Iterable) = apply { + additionalQueryParams.put(key, values) + } + + fun putAllAdditionalQueryParams(additionalQueryParams: QueryParams) = apply { + this.additionalQueryParams.putAll(additionalQueryParams) + } + + fun putAllAdditionalQueryParams(additionalQueryParams: Map>) = + apply { + this.additionalQueryParams.putAll(additionalQueryParams) + } + + fun replaceAdditionalQueryParams(key: String, value: String) = apply { + additionalQueryParams.replace(key, value) + } + + fun replaceAdditionalQueryParams(key: String, values: Iterable) = apply { + additionalQueryParams.replace(key, values) + } + + fun replaceAllAdditionalQueryParams(additionalQueryParams: QueryParams) = apply { + this.additionalQueryParams.replaceAll(additionalQueryParams) + } + + fun replaceAllAdditionalQueryParams(additionalQueryParams: Map>) = + apply { + this.additionalQueryParams.replaceAll(additionalQueryParams) + } + + fun removeAdditionalQueryParams(key: String) = apply { additionalQueryParams.remove(key) } + + fun removeAllAdditionalQueryParams(keys: Set) = apply { + additionalQueryParams.removeAll(keys) + } fun additionalBodyProperties(additionalBodyProperties: Map) = apply { this.additionalBodyProperties.clear() - this.additionalBodyProperties.putAll(additionalBodyProperties) + putAllAdditionalBodyProperties(additionalBodyProperties) } fun putAdditionalBodyProperty(key: String, value: JsonValue) = apply { - this.additionalBodyProperties.put(key, value) + additionalBodyProperties.put(key, value) } fun putAllAdditionalBodyProperties(additionalBodyProperties: Map) = @@ -145,12 +196,20 @@ constructor( this.additionalBodyProperties.putAll(additionalBodyProperties) } + fun removeAdditionalBodyProperty(key: String) = apply { + additionalBodyProperties.remove(key) + } + + fun removeAllAdditionalBodyProperties(keys: Set) = apply { + keys.forEach(::removeAdditionalBodyProperty) + } + fun build(): StoragePresignedUrlCreateParams = StoragePresignedUrlCreateParams( checkNotNull(objectName) { "`objectName` is required but was not set" }, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + additionalHeaders.build(), + additionalQueryParams.build(), + additionalBodyProperties.toImmutable(), ) } } diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/StoragePresignedUrlCreateResponse.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/StoragePresignedUrlCreateResponse.kt index 57c2fca..9806bbe 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/StoragePresignedUrlCreateResponse.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/models/StoragePresignedUrlCreateResponse.kt @@ -11,7 +11,7 @@ import com.openlayer.api.core.JsonField import com.openlayer.api.core.JsonMissing import com.openlayer.api.core.JsonValue import com.openlayer.api.core.NoAutoDetect -import com.openlayer.api.core.toUnmodifiable +import com.openlayer.api.core.toImmutable import java.util.Objects @JsonDeserialize(builder = StoragePresignedUrlCreateResponse.Builder::class) @@ -26,8 +26,6 @@ private constructor( private var validated: Boolean = false - private var hashCode: Int = 0 - /** The presigned url. */ fun url(): String = url.getRequired("url") @@ -37,7 +35,7 @@ private constructor( /** The presigned url. */ @JsonProperty("url") @ExcludeMissing fun _url() = url - /** Fields to include in the body of the upload. Only needed by s3. */ + /** Fields to include in the body of the upload. Only needed by s3 */ @JsonProperty("fields") @ExcludeMissing fun _fields() = fields /** The storage URI to send back to the backend after the upload was completed. */ @@ -57,34 +55,6 @@ private constructor( fun toBuilder() = Builder().from(this) - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return other is StoragePresignedUrlCreateResponse && - this.url == other.url && - this.fields == other.fields && - this.storageUri == other.storageUri && - this.additionalProperties == other.additionalProperties - } - - override fun hashCode(): Int { - if (hashCode == 0) { - hashCode = - Objects.hash( - url, - fields, - storageUri, - additionalProperties, - ) - } - return hashCode - } - - override fun toString() = - "StoragePresignedUrlCreateResponse{url=$url, fields=$fields, storageUri=$storageUri, additionalProperties=$additionalProperties}" - companion object { @JvmStatic fun builder() = Builder() @@ -114,7 +84,7 @@ private constructor( @ExcludeMissing fun url(url: JsonField) = apply { this.url = url } - /** Fields to include in the body of the upload. Only needed by s3. */ + /** Fields to include in the body of the upload. Only needed by s3 */ @JsonProperty("fields") @ExcludeMissing fun fields(fields: JsonValue) = apply { this.fields = fields } @@ -146,7 +116,27 @@ private constructor( url, fields, storageUri, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is StoragePresignedUrlCreateResponse && this.url == other.url && this.fields == other.fields && this.storageUri == other.storageUri && this.additionalProperties == other.additionalProperties /* spotless:on */ + } + + private var hashCode: Int = 0 + + override fun hashCode(): Int { + if (hashCode == 0) { + hashCode = /* spotless:off */ Objects.hash(url, fields, storageUri, additionalProperties) /* spotless:on */ + } + return hashCode + } + + override fun toString() = + "StoragePresignedUrlCreateResponse{url=$url, fields=$fields, storageUri=$storageUri, additionalProperties=$additionalProperties}" } diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/Handlers.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/Handlers.kt deleted file mode 100644 index 4d849f4..0000000 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/Handlers.kt +++ /dev/null @@ -1,121 +0,0 @@ -@file:JvmName("Handlers") - -package com.openlayer.api.services - -import com.fasterxml.jackson.databind.json.JsonMapper -import com.fasterxml.jackson.module.kotlin.jacksonTypeRef -import com.openlayer.api.core.http.BinaryResponseContent -import com.openlayer.api.core.http.HttpResponse -import com.openlayer.api.core.http.HttpResponse.Handler -import com.openlayer.api.errors.BadRequestException -import com.openlayer.api.errors.InternalServerException -import com.openlayer.api.errors.NotFoundException -import com.openlayer.api.errors.OpenlayerError -import com.openlayer.api.errors.OpenlayerException -import com.openlayer.api.errors.PermissionDeniedException -import com.openlayer.api.errors.RateLimitException -import com.openlayer.api.errors.UnauthorizedException -import com.openlayer.api.errors.UnexpectedStatusCodeException -import com.openlayer.api.errors.UnprocessableEntityException -import java.io.InputStream -import java.io.OutputStream -import java.util.Optional - -@JvmSynthetic internal fun emptyHandler(): Handler = EmptyHandler - -private object EmptyHandler : Handler { - override fun handle(response: HttpResponse): Void? = null -} - -@JvmSynthetic internal fun stringHandler(): Handler = StringHandler - -@JvmSynthetic internal fun binaryHandler(): Handler = BinaryHandler - -private object StringHandler : Handler { - override fun handle(response: HttpResponse): String { - return response.body().readBytes().toString(Charsets.UTF_8) - } -} - -private object BinaryHandler : Handler { - override fun handle(response: HttpResponse): BinaryResponseContent { - return object : BinaryResponseContent { - override fun contentType(): Optional = - Optional.ofNullable(response.headers().get("Content-Type").firstOrNull()) - - override fun body(): InputStream = response.body() - - override fun close() = response.close() - - override fun writeTo(outputStream: OutputStream) { - response.body().copyTo(outputStream) - } - } - } -} - -@JvmSynthetic -internal inline fun jsonHandler(jsonMapper: JsonMapper): Handler { - return object : Handler { - override fun handle(response: HttpResponse): T { - try { - return jsonMapper.readValue(response.body(), jacksonTypeRef()) - } catch (e: Exception) { - throw OpenlayerException("Error reading response", e) - } - } - } -} - -@JvmSynthetic -internal fun errorHandler(jsonMapper: JsonMapper): Handler { - val handler = jsonHandler(jsonMapper) - - return object : Handler { - override fun handle(response: HttpResponse): OpenlayerError { - try { - return handler.handle(response) - } catch (e: Exception) { - return OpenlayerError.builder().build() - } - } - } -} - -@JvmSynthetic -internal fun Handler.withErrorHandler(errorHandler: Handler): Handler { - return object : Handler { - override fun handle(response: HttpResponse): T { - when (val statusCode = response.statusCode()) { - in 200..299 -> return this@withErrorHandler.handle(response) - 400 -> throw BadRequestException(response.headers(), errorHandler.handle(response)) - 401 -> - throw UnauthorizedException(response.headers(), errorHandler.handle(response)) - 403 -> - throw PermissionDeniedException( - response.headers(), - errorHandler.handle(response) - ) - 404 -> throw NotFoundException(response.headers(), errorHandler.handle(response)) - 422 -> - throw UnprocessableEntityException( - response.headers(), - errorHandler.handle(response) - ) - 429 -> throw RateLimitException(response.headers(), errorHandler.handle(response)) - in 500..599 -> - throw InternalServerException( - statusCode, - response.headers(), - errorHandler.handle(response) - ) - else -> - throw UnexpectedStatusCodeException( - statusCode, - response.headers(), - StringHandler.handle(response) - ) - } - } - } -} diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/async/CommitServiceAsync.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/async/CommitServiceAsync.kt index 92fd5e9..2fbb5b6 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/async/CommitServiceAsync.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/async/CommitServiceAsync.kt @@ -1,7 +1,5 @@ // File generated from our OpenAPI spec by Stainless. -@file:Suppress("OVERLOADS_INTERFACE") // See https://youtrack.jetbrains.com/issue/KT-36102 - package com.openlayer.api.services.async import com.openlayer.api.services.async.commits.TestResultServiceAsync diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/async/CommitServiceAsyncImpl.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/async/CommitServiceAsyncImpl.kt index ef73e6d..9fcf0d4 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/async/CommitServiceAsyncImpl.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/async/CommitServiceAsyncImpl.kt @@ -3,19 +3,14 @@ package com.openlayer.api.services.async import com.openlayer.api.core.ClientOptions -import com.openlayer.api.core.http.HttpResponse.Handler -import com.openlayer.api.errors.OpenlayerError import com.openlayer.api.services.async.commits.TestResultServiceAsync import com.openlayer.api.services.async.commits.TestResultServiceAsyncImpl -import com.openlayer.api.services.errorHandler class CommitServiceAsyncImpl constructor( private val clientOptions: ClientOptions, ) : CommitServiceAsync { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) - private val testResults: TestResultServiceAsync by lazy { TestResultServiceAsyncImpl(clientOptions) } diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/async/InferencePipelineServiceAsyncImpl.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/async/InferencePipelineServiceAsyncImpl.kt index c5fd091..62b8afb 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/async/InferencePipelineServiceAsyncImpl.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/async/InferencePipelineServiceAsyncImpl.kt @@ -4,9 +4,14 @@ package com.openlayer.api.services.async import com.openlayer.api.core.ClientOptions import com.openlayer.api.core.RequestOptions +import com.openlayer.api.core.handlers.emptyHandler +import com.openlayer.api.core.handlers.errorHandler +import com.openlayer.api.core.handlers.jsonHandler +import com.openlayer.api.core.handlers.withErrorHandler import com.openlayer.api.core.http.HttpMethod import com.openlayer.api.core.http.HttpRequest import com.openlayer.api.core.http.HttpResponse.Handler +import com.openlayer.api.core.json import com.openlayer.api.errors.OpenlayerError import com.openlayer.api.models.InferencePipelineDeleteParams import com.openlayer.api.models.InferencePipelineRetrieveParams @@ -19,11 +24,6 @@ import com.openlayer.api.services.async.inferencePipelines.RowServiceAsync import com.openlayer.api.services.async.inferencePipelines.RowServiceAsyncImpl import com.openlayer.api.services.async.inferencePipelines.TestResultServiceAsync import com.openlayer.api.services.async.inferencePipelines.TestResultServiceAsyncImpl -import com.openlayer.api.services.emptyHandler -import com.openlayer.api.services.errorHandler -import com.openlayer.api.services.json -import com.openlayer.api.services.jsonHandler -import com.openlayer.api.services.withErrorHandler import java.util.concurrent.CompletableFuture class InferencePipelineServiceAsyncImpl @@ -61,9 +61,9 @@ constructor( .method(HttpMethod.GET) .addPathSegments("inference-pipelines", params.getPathParam(0)) .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) + .replaceAllQueryParams(params.getQueryParams()) .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response -> @@ -91,9 +91,9 @@ constructor( .method(HttpMethod.PUT) .addPathSegments("inference-pipelines", params.getPathParam(0)) .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) + .replaceAllQueryParams(params.getQueryParams()) .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response @@ -120,9 +120,9 @@ constructor( .method(HttpMethod.DELETE) .addPathSegments("inference-pipelines", params.getPathParam(0)) .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) + .replaceAllQueryParams(params.getQueryParams()) .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .replaceAllHeaders(params.getHeaders()) .apply { params.getBody().ifPresent { body(json(clientOptions.jsonMapper, it)) } } .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/async/ProjectServiceAsyncImpl.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/async/ProjectServiceAsyncImpl.kt index b49f449..ac41df9 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/async/ProjectServiceAsyncImpl.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/async/ProjectServiceAsyncImpl.kt @@ -4,9 +4,13 @@ package com.openlayer.api.services.async import com.openlayer.api.core.ClientOptions import com.openlayer.api.core.RequestOptions +import com.openlayer.api.core.handlers.errorHandler +import com.openlayer.api.core.handlers.jsonHandler +import com.openlayer.api.core.handlers.withErrorHandler import com.openlayer.api.core.http.HttpMethod import com.openlayer.api.core.http.HttpRequest import com.openlayer.api.core.http.HttpResponse.Handler +import com.openlayer.api.core.json import com.openlayer.api.errors.OpenlayerError import com.openlayer.api.models.ProjectCreateParams import com.openlayer.api.models.ProjectCreateResponse @@ -16,10 +20,6 @@ import com.openlayer.api.services.async.projects.CommitServiceAsync import com.openlayer.api.services.async.projects.CommitServiceAsyncImpl import com.openlayer.api.services.async.projects.InferencePipelineServiceAsync import com.openlayer.api.services.async.projects.InferencePipelineServiceAsyncImpl -import com.openlayer.api.services.errorHandler -import com.openlayer.api.services.json -import com.openlayer.api.services.jsonHandler -import com.openlayer.api.services.withErrorHandler import java.util.concurrent.CompletableFuture class ProjectServiceAsyncImpl @@ -52,9 +52,9 @@ constructor( .method(HttpMethod.POST) .addPathSegments("projects") .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) + .replaceAllQueryParams(params.getQueryParams()) .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response @@ -82,9 +82,9 @@ constructor( .method(HttpMethod.GET) .addPathSegments("projects") .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) + .replaceAllQueryParams(params.getQueryParams()) .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response -> diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/async/StorageServiceAsync.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/async/StorageServiceAsync.kt index 6a59073..2030c4a 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/async/StorageServiceAsync.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/async/StorageServiceAsync.kt @@ -1,7 +1,5 @@ // File generated from our OpenAPI spec by Stainless. -@file:Suppress("OVERLOADS_INTERFACE") // See https://youtrack.jetbrains.com/issue/KT-36102 - package com.openlayer.api.services.async import com.openlayer.api.services.async.storage.PresignedUrlServiceAsync diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/async/StorageServiceAsyncImpl.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/async/StorageServiceAsyncImpl.kt index 2dd732c..088fa25 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/async/StorageServiceAsyncImpl.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/async/StorageServiceAsyncImpl.kt @@ -3,19 +3,14 @@ package com.openlayer.api.services.async import com.openlayer.api.core.ClientOptions -import com.openlayer.api.core.http.HttpResponse.Handler -import com.openlayer.api.errors.OpenlayerError import com.openlayer.api.services.async.storage.PresignedUrlServiceAsync import com.openlayer.api.services.async.storage.PresignedUrlServiceAsyncImpl -import com.openlayer.api.services.errorHandler class StorageServiceAsyncImpl constructor( private val clientOptions: ClientOptions, ) : StorageServiceAsync { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) - private val presignedUrl: PresignedUrlServiceAsync by lazy { PresignedUrlServiceAsyncImpl(clientOptions) } diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/async/commits/TestResultServiceAsyncImpl.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/async/commits/TestResultServiceAsyncImpl.kt index ac4c25f..9c554b1 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/async/commits/TestResultServiceAsyncImpl.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/async/commits/TestResultServiceAsyncImpl.kt @@ -4,15 +4,15 @@ package com.openlayer.api.services.async.commits import com.openlayer.api.core.ClientOptions import com.openlayer.api.core.RequestOptions +import com.openlayer.api.core.handlers.errorHandler +import com.openlayer.api.core.handlers.jsonHandler +import com.openlayer.api.core.handlers.withErrorHandler import com.openlayer.api.core.http.HttpMethod import com.openlayer.api.core.http.HttpRequest import com.openlayer.api.core.http.HttpResponse.Handler import com.openlayer.api.errors.OpenlayerError import com.openlayer.api.models.CommitTestResultListParams import com.openlayer.api.models.CommitTestResultListResponse -import com.openlayer.api.services.errorHandler -import com.openlayer.api.services.jsonHandler -import com.openlayer.api.services.withErrorHandler import java.util.concurrent.CompletableFuture class TestResultServiceAsyncImpl @@ -36,9 +36,9 @@ constructor( .method(HttpMethod.GET) .addPathSegments("versions", params.getPathParam(0), "results") .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) + .replaceAllQueryParams(params.getQueryParams()) .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response -> diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/async/inferencePipelines/DataServiceAsyncImpl.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/async/inferencePipelines/DataServiceAsyncImpl.kt index bbbf784..cc3c822 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/async/inferencePipelines/DataServiceAsyncImpl.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/async/inferencePipelines/DataServiceAsyncImpl.kt @@ -4,16 +4,16 @@ package com.openlayer.api.services.async.inferencePipelines import com.openlayer.api.core.ClientOptions import com.openlayer.api.core.RequestOptions +import com.openlayer.api.core.handlers.errorHandler +import com.openlayer.api.core.handlers.jsonHandler +import com.openlayer.api.core.handlers.withErrorHandler import com.openlayer.api.core.http.HttpMethod import com.openlayer.api.core.http.HttpRequest import com.openlayer.api.core.http.HttpResponse.Handler +import com.openlayer.api.core.json import com.openlayer.api.errors.OpenlayerError import com.openlayer.api.models.InferencePipelineDataStreamParams import com.openlayer.api.models.InferencePipelineDataStreamResponse -import com.openlayer.api.services.errorHandler -import com.openlayer.api.services.json -import com.openlayer.api.services.jsonHandler -import com.openlayer.api.services.withErrorHandler import java.util.concurrent.CompletableFuture class DataServiceAsyncImpl @@ -37,9 +37,9 @@ constructor( .method(HttpMethod.POST) .addPathSegments("inference-pipelines", params.getPathParam(0), "data-stream") .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) + .replaceAllQueryParams(params.getQueryParams()) .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/async/inferencePipelines/RowServiceAsyncImpl.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/async/inferencePipelines/RowServiceAsyncImpl.kt index 9304fa7..a54c268 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/async/inferencePipelines/RowServiceAsyncImpl.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/async/inferencePipelines/RowServiceAsyncImpl.kt @@ -4,16 +4,16 @@ package com.openlayer.api.services.async.inferencePipelines import com.openlayer.api.core.ClientOptions import com.openlayer.api.core.RequestOptions +import com.openlayer.api.core.handlers.errorHandler +import com.openlayer.api.core.handlers.jsonHandler +import com.openlayer.api.core.handlers.withErrorHandler import com.openlayer.api.core.http.HttpMethod import com.openlayer.api.core.http.HttpRequest import com.openlayer.api.core.http.HttpResponse.Handler +import com.openlayer.api.core.json import com.openlayer.api.errors.OpenlayerError import com.openlayer.api.models.InferencePipelineRowUpdateParams import com.openlayer.api.models.InferencePipelineRowUpdateResponse -import com.openlayer.api.services.errorHandler -import com.openlayer.api.services.json -import com.openlayer.api.services.jsonHandler -import com.openlayer.api.services.withErrorHandler import java.util.concurrent.CompletableFuture class RowServiceAsyncImpl @@ -37,9 +37,9 @@ constructor( .method(HttpMethod.PUT) .addPathSegments("inference-pipelines", params.getPathParam(0), "rows") .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) + .replaceAllQueryParams(params.getQueryParams()) .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/async/inferencePipelines/TestResultServiceAsyncImpl.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/async/inferencePipelines/TestResultServiceAsyncImpl.kt index 0b4305b..2474a45 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/async/inferencePipelines/TestResultServiceAsyncImpl.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/async/inferencePipelines/TestResultServiceAsyncImpl.kt @@ -4,15 +4,15 @@ package com.openlayer.api.services.async.inferencePipelines import com.openlayer.api.core.ClientOptions import com.openlayer.api.core.RequestOptions +import com.openlayer.api.core.handlers.errorHandler +import com.openlayer.api.core.handlers.jsonHandler +import com.openlayer.api.core.handlers.withErrorHandler import com.openlayer.api.core.http.HttpMethod import com.openlayer.api.core.http.HttpRequest import com.openlayer.api.core.http.HttpResponse.Handler import com.openlayer.api.errors.OpenlayerError import com.openlayer.api.models.InferencePipelineTestResultListParams import com.openlayer.api.models.InferencePipelineTestResultListResponse -import com.openlayer.api.services.errorHandler -import com.openlayer.api.services.jsonHandler -import com.openlayer.api.services.withErrorHandler import java.util.concurrent.CompletableFuture class TestResultServiceAsyncImpl @@ -36,9 +36,9 @@ constructor( .method(HttpMethod.GET) .addPathSegments("inference-pipelines", params.getPathParam(0), "results") .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) + .replaceAllQueryParams(params.getQueryParams()) .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response -> diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/async/projects/CommitServiceAsync.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/async/projects/CommitServiceAsync.kt index cc723f2..e10cd5c 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/async/projects/CommitServiceAsync.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/async/projects/CommitServiceAsync.kt @@ -5,12 +5,21 @@ package com.openlayer.api.services.async.projects import com.openlayer.api.core.RequestOptions +import com.openlayer.api.models.ProjectCommitCreateParams +import com.openlayer.api.models.ProjectCommitCreateResponse import com.openlayer.api.models.ProjectCommitListParams import com.openlayer.api.models.ProjectCommitListResponse import java.util.concurrent.CompletableFuture interface CommitServiceAsync { + /** Create a new commit (project version) in a project. */ + @JvmOverloads + fun create( + params: ProjectCommitCreateParams, + requestOptions: RequestOptions = RequestOptions.none() + ): CompletableFuture + /** List the commits (project versions) in a project. */ @JvmOverloads fun list( diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/async/projects/CommitServiceAsyncImpl.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/async/projects/CommitServiceAsyncImpl.kt index 9fb60aa..b0440f4 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/async/projects/CommitServiceAsyncImpl.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/async/projects/CommitServiceAsyncImpl.kt @@ -4,15 +4,18 @@ package com.openlayer.api.services.async.projects import com.openlayer.api.core.ClientOptions import com.openlayer.api.core.RequestOptions +import com.openlayer.api.core.handlers.errorHandler +import com.openlayer.api.core.handlers.jsonHandler +import com.openlayer.api.core.handlers.withErrorHandler import com.openlayer.api.core.http.HttpMethod import com.openlayer.api.core.http.HttpRequest import com.openlayer.api.core.http.HttpResponse.Handler +import com.openlayer.api.core.json import com.openlayer.api.errors.OpenlayerError +import com.openlayer.api.models.ProjectCommitCreateParams +import com.openlayer.api.models.ProjectCommitCreateResponse import com.openlayer.api.models.ProjectCommitListParams import com.openlayer.api.models.ProjectCommitListResponse -import com.openlayer.api.services.errorHandler -import com.openlayer.api.services.jsonHandler -import com.openlayer.api.services.withErrorHandler import java.util.concurrent.CompletableFuture class CommitServiceAsyncImpl @@ -22,6 +25,37 @@ constructor( private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val createHandler: Handler = + jsonHandler(clientOptions.jsonMapper) + .withErrorHandler(errorHandler) + + /** Create a new commit (project version) in a project. */ + override fun create( + params: ProjectCommitCreateParams, + requestOptions: RequestOptions + ): CompletableFuture { + val request = + HttpRequest.builder() + .method(HttpMethod.POST) + .addPathSegments("projects", params.getPathParam(0), "versions") + .putAllQueryParams(clientOptions.queryParams) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers) + .replaceAllHeaders(params.getHeaders()) + .body(json(clientOptions.jsonMapper, params.getBody())) + .build() + return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response + -> + response + .use { createHandler.handle(it) } + .apply { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + validate() + } + } + } + } + private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) .withErrorHandler(errorHandler) @@ -36,9 +70,9 @@ constructor( .method(HttpMethod.GET) .addPathSegments("projects", params.getPathParam(0), "versions") .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) + .replaceAllQueryParams(params.getQueryParams()) .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response -> diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/async/projects/InferencePipelineServiceAsyncImpl.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/async/projects/InferencePipelineServiceAsyncImpl.kt index 262589d..e02d123 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/async/projects/InferencePipelineServiceAsyncImpl.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/async/projects/InferencePipelineServiceAsyncImpl.kt @@ -4,18 +4,18 @@ package com.openlayer.api.services.async.projects import com.openlayer.api.core.ClientOptions import com.openlayer.api.core.RequestOptions +import com.openlayer.api.core.handlers.errorHandler +import com.openlayer.api.core.handlers.jsonHandler +import com.openlayer.api.core.handlers.withErrorHandler import com.openlayer.api.core.http.HttpMethod import com.openlayer.api.core.http.HttpRequest import com.openlayer.api.core.http.HttpResponse.Handler +import com.openlayer.api.core.json import com.openlayer.api.errors.OpenlayerError import com.openlayer.api.models.ProjectInferencePipelineCreateParams import com.openlayer.api.models.ProjectInferencePipelineCreateResponse import com.openlayer.api.models.ProjectInferencePipelineListParams import com.openlayer.api.models.ProjectInferencePipelineListResponse -import com.openlayer.api.services.errorHandler -import com.openlayer.api.services.json -import com.openlayer.api.services.jsonHandler -import com.openlayer.api.services.withErrorHandler import java.util.concurrent.CompletableFuture class InferencePipelineServiceAsyncImpl @@ -39,9 +39,9 @@ constructor( .method(HttpMethod.POST) .addPathSegments("projects", params.getPathParam(0), "inference-pipelines") .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) + .replaceAllQueryParams(params.getQueryParams()) .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response @@ -70,9 +70,9 @@ constructor( .method(HttpMethod.GET) .addPathSegments("projects", params.getPathParam(0), "inference-pipelines") .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) + .replaceAllQueryParams(params.getQueryParams()) .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response -> diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/async/storage/PresignedUrlServiceAsyncImpl.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/async/storage/PresignedUrlServiceAsyncImpl.kt index 65a6972..89153fd 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/async/storage/PresignedUrlServiceAsyncImpl.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/async/storage/PresignedUrlServiceAsyncImpl.kt @@ -4,16 +4,16 @@ package com.openlayer.api.services.async.storage import com.openlayer.api.core.ClientOptions import com.openlayer.api.core.RequestOptions +import com.openlayer.api.core.handlers.errorHandler +import com.openlayer.api.core.handlers.jsonHandler +import com.openlayer.api.core.handlers.withErrorHandler import com.openlayer.api.core.http.HttpMethod import com.openlayer.api.core.http.HttpRequest import com.openlayer.api.core.http.HttpResponse.Handler +import com.openlayer.api.core.json import com.openlayer.api.errors.OpenlayerError import com.openlayer.api.models.StoragePresignedUrlCreateParams import com.openlayer.api.models.StoragePresignedUrlCreateResponse -import com.openlayer.api.services.errorHandler -import com.openlayer.api.services.json -import com.openlayer.api.services.jsonHandler -import com.openlayer.api.services.withErrorHandler import java.util.concurrent.CompletableFuture class PresignedUrlServiceAsyncImpl @@ -37,9 +37,9 @@ constructor( .method(HttpMethod.POST) .addPathSegments("storage", "presigned-url") .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) + .replaceAllQueryParams(params.getQueryParams()) .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .replaceAllHeaders(params.getHeaders()) .apply { params.getBody().ifPresent { body(json(clientOptions.jsonMapper, it)) } } .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/blocking/CommitService.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/blocking/CommitService.kt index 86553e1..6c80386 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/blocking/CommitService.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/blocking/CommitService.kt @@ -1,7 +1,5 @@ // File generated from our OpenAPI spec by Stainless. -@file:Suppress("OVERLOADS_INTERFACE") // See https://youtrack.jetbrains.com/issue/KT-36102 - package com.openlayer.api.services.blocking import com.openlayer.api.services.blocking.commits.TestResultService diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/blocking/CommitServiceImpl.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/blocking/CommitServiceImpl.kt index cae0abd..50222a8 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/blocking/CommitServiceImpl.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/blocking/CommitServiceImpl.kt @@ -3,19 +3,14 @@ package com.openlayer.api.services.blocking import com.openlayer.api.core.ClientOptions -import com.openlayer.api.core.http.HttpResponse.Handler -import com.openlayer.api.errors.OpenlayerError import com.openlayer.api.services.blocking.commits.TestResultService import com.openlayer.api.services.blocking.commits.TestResultServiceImpl -import com.openlayer.api.services.errorHandler class CommitServiceImpl constructor( private val clientOptions: ClientOptions, ) : CommitService { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) - private val testResults: TestResultService by lazy { TestResultServiceImpl(clientOptions) } override fun testResults(): TestResultService = testResults diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/blocking/InferencePipelineServiceImpl.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/blocking/InferencePipelineServiceImpl.kt index efc4fb6..40eb3ee 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/blocking/InferencePipelineServiceImpl.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/blocking/InferencePipelineServiceImpl.kt @@ -4,9 +4,14 @@ package com.openlayer.api.services.blocking import com.openlayer.api.core.ClientOptions import com.openlayer.api.core.RequestOptions +import com.openlayer.api.core.handlers.emptyHandler +import com.openlayer.api.core.handlers.errorHandler +import com.openlayer.api.core.handlers.jsonHandler +import com.openlayer.api.core.handlers.withErrorHandler import com.openlayer.api.core.http.HttpMethod import com.openlayer.api.core.http.HttpRequest import com.openlayer.api.core.http.HttpResponse.Handler +import com.openlayer.api.core.json import com.openlayer.api.errors.OpenlayerError import com.openlayer.api.models.InferencePipelineDeleteParams import com.openlayer.api.models.InferencePipelineRetrieveParams @@ -19,11 +24,6 @@ import com.openlayer.api.services.blocking.inferencePipelines.RowService import com.openlayer.api.services.blocking.inferencePipelines.RowServiceImpl import com.openlayer.api.services.blocking.inferencePipelines.TestResultService import com.openlayer.api.services.blocking.inferencePipelines.TestResultServiceImpl -import com.openlayer.api.services.emptyHandler -import com.openlayer.api.services.errorHandler -import com.openlayer.api.services.json -import com.openlayer.api.services.jsonHandler -import com.openlayer.api.services.withErrorHandler class InferencePipelineServiceImpl constructor( @@ -58,9 +58,9 @@ constructor( .method(HttpMethod.GET) .addPathSegments("inference-pipelines", params.getPathParam(0)) .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) + .replaceAllQueryParams(params.getQueryParams()) .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> response @@ -87,9 +87,9 @@ constructor( .method(HttpMethod.PUT) .addPathSegments("inference-pipelines", params.getPathParam(0)) .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) + .replaceAllQueryParams(params.getQueryParams()) .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> @@ -112,9 +112,9 @@ constructor( .method(HttpMethod.DELETE) .addPathSegments("inference-pipelines", params.getPathParam(0)) .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) + .replaceAllQueryParams(params.getQueryParams()) .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .replaceAllHeaders(params.getHeaders()) .apply { params.getBody().ifPresent { body(json(clientOptions.jsonMapper, it)) } } .build() clientOptions.httpClient.execute(request, requestOptions).let { response -> diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/blocking/ProjectServiceImpl.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/blocking/ProjectServiceImpl.kt index e441602..b90d15a 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/blocking/ProjectServiceImpl.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/blocking/ProjectServiceImpl.kt @@ -4,9 +4,13 @@ package com.openlayer.api.services.blocking import com.openlayer.api.core.ClientOptions import com.openlayer.api.core.RequestOptions +import com.openlayer.api.core.handlers.errorHandler +import com.openlayer.api.core.handlers.jsonHandler +import com.openlayer.api.core.handlers.withErrorHandler import com.openlayer.api.core.http.HttpMethod import com.openlayer.api.core.http.HttpRequest import com.openlayer.api.core.http.HttpResponse.Handler +import com.openlayer.api.core.json import com.openlayer.api.errors.OpenlayerError import com.openlayer.api.models.ProjectCreateParams import com.openlayer.api.models.ProjectCreateResponse @@ -16,10 +20,6 @@ import com.openlayer.api.services.blocking.projects.CommitService import com.openlayer.api.services.blocking.projects.CommitServiceImpl import com.openlayer.api.services.blocking.projects.InferencePipelineService import com.openlayer.api.services.blocking.projects.InferencePipelineServiceImpl -import com.openlayer.api.services.errorHandler -import com.openlayer.api.services.json -import com.openlayer.api.services.jsonHandler -import com.openlayer.api.services.withErrorHandler class ProjectServiceImpl constructor( @@ -51,9 +51,9 @@ constructor( .method(HttpMethod.POST) .addPathSegments("projects") .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) + .replaceAllQueryParams(params.getQueryParams()) .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> @@ -80,9 +80,9 @@ constructor( .method(HttpMethod.GET) .addPathSegments("projects") .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) + .replaceAllQueryParams(params.getQueryParams()) .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> response diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/blocking/StorageService.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/blocking/StorageService.kt index bd8b0a0..20ae29a 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/blocking/StorageService.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/blocking/StorageService.kt @@ -1,7 +1,5 @@ // File generated from our OpenAPI spec by Stainless. -@file:Suppress("OVERLOADS_INTERFACE") // See https://youtrack.jetbrains.com/issue/KT-36102 - package com.openlayer.api.services.blocking import com.openlayer.api.services.blocking.storage.PresignedUrlService diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/blocking/StorageServiceImpl.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/blocking/StorageServiceImpl.kt index 25ff043..f33a55f 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/blocking/StorageServiceImpl.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/blocking/StorageServiceImpl.kt @@ -3,19 +3,14 @@ package com.openlayer.api.services.blocking import com.openlayer.api.core.ClientOptions -import com.openlayer.api.core.http.HttpResponse.Handler -import com.openlayer.api.errors.OpenlayerError import com.openlayer.api.services.blocking.storage.PresignedUrlService import com.openlayer.api.services.blocking.storage.PresignedUrlServiceImpl -import com.openlayer.api.services.errorHandler class StorageServiceImpl constructor( private val clientOptions: ClientOptions, ) : StorageService { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) - private val presignedUrl: PresignedUrlService by lazy { PresignedUrlServiceImpl(clientOptions) } override fun presignedUrl(): PresignedUrlService = presignedUrl diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/blocking/commits/TestResultServiceImpl.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/blocking/commits/TestResultServiceImpl.kt index 01739b4..272c1f5 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/blocking/commits/TestResultServiceImpl.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/blocking/commits/TestResultServiceImpl.kt @@ -4,15 +4,15 @@ package com.openlayer.api.services.blocking.commits import com.openlayer.api.core.ClientOptions import com.openlayer.api.core.RequestOptions +import com.openlayer.api.core.handlers.errorHandler +import com.openlayer.api.core.handlers.jsonHandler +import com.openlayer.api.core.handlers.withErrorHandler import com.openlayer.api.core.http.HttpMethod import com.openlayer.api.core.http.HttpRequest import com.openlayer.api.core.http.HttpResponse.Handler import com.openlayer.api.errors.OpenlayerError import com.openlayer.api.models.CommitTestResultListParams import com.openlayer.api.models.CommitTestResultListResponse -import com.openlayer.api.services.errorHandler -import com.openlayer.api.services.jsonHandler -import com.openlayer.api.services.withErrorHandler class TestResultServiceImpl constructor( @@ -35,9 +35,9 @@ constructor( .method(HttpMethod.GET) .addPathSegments("versions", params.getPathParam(0), "results") .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) + .replaceAllQueryParams(params.getQueryParams()) .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> response diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/blocking/inferencePipelines/DataServiceImpl.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/blocking/inferencePipelines/DataServiceImpl.kt index 41c4268..b330931 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/blocking/inferencePipelines/DataServiceImpl.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/blocking/inferencePipelines/DataServiceImpl.kt @@ -4,16 +4,16 @@ package com.openlayer.api.services.blocking.inferencePipelines import com.openlayer.api.core.ClientOptions import com.openlayer.api.core.RequestOptions +import com.openlayer.api.core.handlers.errorHandler +import com.openlayer.api.core.handlers.jsonHandler +import com.openlayer.api.core.handlers.withErrorHandler import com.openlayer.api.core.http.HttpMethod import com.openlayer.api.core.http.HttpRequest import com.openlayer.api.core.http.HttpResponse.Handler +import com.openlayer.api.core.json import com.openlayer.api.errors.OpenlayerError import com.openlayer.api.models.InferencePipelineDataStreamParams import com.openlayer.api.models.InferencePipelineDataStreamResponse -import com.openlayer.api.services.errorHandler -import com.openlayer.api.services.json -import com.openlayer.api.services.jsonHandler -import com.openlayer.api.services.withErrorHandler class DataServiceImpl constructor( @@ -36,9 +36,9 @@ constructor( .method(HttpMethod.POST) .addPathSegments("inference-pipelines", params.getPathParam(0), "data-stream") .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) + .replaceAllQueryParams(params.getQueryParams()) .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/blocking/inferencePipelines/RowServiceImpl.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/blocking/inferencePipelines/RowServiceImpl.kt index d5f73a0..537d7da 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/blocking/inferencePipelines/RowServiceImpl.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/blocking/inferencePipelines/RowServiceImpl.kt @@ -4,16 +4,16 @@ package com.openlayer.api.services.blocking.inferencePipelines import com.openlayer.api.core.ClientOptions import com.openlayer.api.core.RequestOptions +import com.openlayer.api.core.handlers.errorHandler +import com.openlayer.api.core.handlers.jsonHandler +import com.openlayer.api.core.handlers.withErrorHandler import com.openlayer.api.core.http.HttpMethod import com.openlayer.api.core.http.HttpRequest import com.openlayer.api.core.http.HttpResponse.Handler +import com.openlayer.api.core.json import com.openlayer.api.errors.OpenlayerError import com.openlayer.api.models.InferencePipelineRowUpdateParams import com.openlayer.api.models.InferencePipelineRowUpdateResponse -import com.openlayer.api.services.errorHandler -import com.openlayer.api.services.json -import com.openlayer.api.services.jsonHandler -import com.openlayer.api.services.withErrorHandler class RowServiceImpl constructor( @@ -36,9 +36,9 @@ constructor( .method(HttpMethod.PUT) .addPathSegments("inference-pipelines", params.getPathParam(0), "rows") .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) + .replaceAllQueryParams(params.getQueryParams()) .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/blocking/inferencePipelines/TestResultServiceImpl.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/blocking/inferencePipelines/TestResultServiceImpl.kt index 675b14f..ac76753 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/blocking/inferencePipelines/TestResultServiceImpl.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/blocking/inferencePipelines/TestResultServiceImpl.kt @@ -4,15 +4,15 @@ package com.openlayer.api.services.blocking.inferencePipelines import com.openlayer.api.core.ClientOptions import com.openlayer.api.core.RequestOptions +import com.openlayer.api.core.handlers.errorHandler +import com.openlayer.api.core.handlers.jsonHandler +import com.openlayer.api.core.handlers.withErrorHandler import com.openlayer.api.core.http.HttpMethod import com.openlayer.api.core.http.HttpRequest import com.openlayer.api.core.http.HttpResponse.Handler import com.openlayer.api.errors.OpenlayerError import com.openlayer.api.models.InferencePipelineTestResultListParams import com.openlayer.api.models.InferencePipelineTestResultListResponse -import com.openlayer.api.services.errorHandler -import com.openlayer.api.services.jsonHandler -import com.openlayer.api.services.withErrorHandler class TestResultServiceImpl constructor( @@ -35,9 +35,9 @@ constructor( .method(HttpMethod.GET) .addPathSegments("inference-pipelines", params.getPathParam(0), "results") .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) + .replaceAllQueryParams(params.getQueryParams()) .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> response diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/blocking/projects/CommitService.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/blocking/projects/CommitService.kt index c9fb11e..9874a6e 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/blocking/projects/CommitService.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/blocking/projects/CommitService.kt @@ -5,11 +5,20 @@ package com.openlayer.api.services.blocking.projects import com.openlayer.api.core.RequestOptions +import com.openlayer.api.models.ProjectCommitCreateParams +import com.openlayer.api.models.ProjectCommitCreateResponse import com.openlayer.api.models.ProjectCommitListParams import com.openlayer.api.models.ProjectCommitListResponse interface CommitService { + /** Create a new commit (project version) in a project. */ + @JvmOverloads + fun create( + params: ProjectCommitCreateParams, + requestOptions: RequestOptions = RequestOptions.none() + ): ProjectCommitCreateResponse + /** List the commits (project versions) in a project. */ @JvmOverloads fun list( diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/blocking/projects/CommitServiceImpl.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/blocking/projects/CommitServiceImpl.kt index 6cb0342..283067f 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/blocking/projects/CommitServiceImpl.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/blocking/projects/CommitServiceImpl.kt @@ -4,15 +4,18 @@ package com.openlayer.api.services.blocking.projects import com.openlayer.api.core.ClientOptions import com.openlayer.api.core.RequestOptions +import com.openlayer.api.core.handlers.errorHandler +import com.openlayer.api.core.handlers.jsonHandler +import com.openlayer.api.core.handlers.withErrorHandler import com.openlayer.api.core.http.HttpMethod import com.openlayer.api.core.http.HttpRequest import com.openlayer.api.core.http.HttpResponse.Handler +import com.openlayer.api.core.json import com.openlayer.api.errors.OpenlayerError +import com.openlayer.api.models.ProjectCommitCreateParams +import com.openlayer.api.models.ProjectCommitCreateResponse import com.openlayer.api.models.ProjectCommitListParams import com.openlayer.api.models.ProjectCommitListResponse -import com.openlayer.api.services.errorHandler -import com.openlayer.api.services.jsonHandler -import com.openlayer.api.services.withErrorHandler class CommitServiceImpl constructor( @@ -21,6 +24,36 @@ constructor( private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) + private val createHandler: Handler = + jsonHandler(clientOptions.jsonMapper) + .withErrorHandler(errorHandler) + + /** Create a new commit (project version) in a project. */ + override fun create( + params: ProjectCommitCreateParams, + requestOptions: RequestOptions + ): ProjectCommitCreateResponse { + val request = + HttpRequest.builder() + .method(HttpMethod.POST) + .addPathSegments("projects", params.getPathParam(0), "versions") + .putAllQueryParams(clientOptions.queryParams) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers) + .replaceAllHeaders(params.getHeaders()) + .body(json(clientOptions.jsonMapper, params.getBody())) + .build() + return clientOptions.httpClient.execute(request, requestOptions).let { response -> + response + .use { createHandler.handle(it) } + .apply { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + validate() + } + } + } + } + private val listHandler: Handler = jsonHandler(clientOptions.jsonMapper) .withErrorHandler(errorHandler) @@ -35,9 +68,9 @@ constructor( .method(HttpMethod.GET) .addPathSegments("projects", params.getPathParam(0), "versions") .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) + .replaceAllQueryParams(params.getQueryParams()) .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> response diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/blocking/projects/InferencePipelineServiceImpl.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/blocking/projects/InferencePipelineServiceImpl.kt index cb8655e..2226840 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/blocking/projects/InferencePipelineServiceImpl.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/blocking/projects/InferencePipelineServiceImpl.kt @@ -4,18 +4,18 @@ package com.openlayer.api.services.blocking.projects import com.openlayer.api.core.ClientOptions import com.openlayer.api.core.RequestOptions +import com.openlayer.api.core.handlers.errorHandler +import com.openlayer.api.core.handlers.jsonHandler +import com.openlayer.api.core.handlers.withErrorHandler import com.openlayer.api.core.http.HttpMethod import com.openlayer.api.core.http.HttpRequest import com.openlayer.api.core.http.HttpResponse.Handler +import com.openlayer.api.core.json import com.openlayer.api.errors.OpenlayerError import com.openlayer.api.models.ProjectInferencePipelineCreateParams import com.openlayer.api.models.ProjectInferencePipelineCreateResponse import com.openlayer.api.models.ProjectInferencePipelineListParams import com.openlayer.api.models.ProjectInferencePipelineListResponse -import com.openlayer.api.services.errorHandler -import com.openlayer.api.services.json -import com.openlayer.api.services.jsonHandler -import com.openlayer.api.services.withErrorHandler class InferencePipelineServiceImpl constructor( @@ -38,9 +38,9 @@ constructor( .method(HttpMethod.POST) .addPathSegments("projects", params.getPathParam(0), "inference-pipelines") .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) + .replaceAllQueryParams(params.getQueryParams()) .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> @@ -68,9 +68,9 @@ constructor( .method(HttpMethod.GET) .addPathSegments("projects", params.getPathParam(0), "inference-pipelines") .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) + .replaceAllQueryParams(params.getQueryParams()) .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> response diff --git a/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/blocking/storage/PresignedUrlServiceImpl.kt b/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/blocking/storage/PresignedUrlServiceImpl.kt index dabbfe5..e89676f 100644 --- a/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/blocking/storage/PresignedUrlServiceImpl.kt +++ b/openlayer-java-core/src/main/kotlin/com/openlayer/api/services/blocking/storage/PresignedUrlServiceImpl.kt @@ -4,16 +4,16 @@ package com.openlayer.api.services.blocking.storage import com.openlayer.api.core.ClientOptions import com.openlayer.api.core.RequestOptions +import com.openlayer.api.core.handlers.errorHandler +import com.openlayer.api.core.handlers.jsonHandler +import com.openlayer.api.core.handlers.withErrorHandler import com.openlayer.api.core.http.HttpMethod import com.openlayer.api.core.http.HttpRequest import com.openlayer.api.core.http.HttpResponse.Handler +import com.openlayer.api.core.json import com.openlayer.api.errors.OpenlayerError import com.openlayer.api.models.StoragePresignedUrlCreateParams import com.openlayer.api.models.StoragePresignedUrlCreateResponse -import com.openlayer.api.services.errorHandler -import com.openlayer.api.services.json -import com.openlayer.api.services.jsonHandler -import com.openlayer.api.services.withErrorHandler class PresignedUrlServiceImpl constructor( @@ -36,9 +36,9 @@ constructor( .method(HttpMethod.POST) .addPathSegments("storage", "presigned-url") .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) + .replaceAllQueryParams(params.getQueryParams()) .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .replaceAllHeaders(params.getHeaders()) .apply { params.getBody().ifPresent { body(json(clientOptions.jsonMapper, it)) } } .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> diff --git a/openlayer-java-core/src/test/kotlin/com/openlayer/api/core/PhantomReachableTest.kt b/openlayer-java-core/src/test/kotlin/com/openlayer/api/core/PhantomReachableTest.kt new file mode 100644 index 0000000..b991a43 --- /dev/null +++ b/openlayer-java-core/src/test/kotlin/com/openlayer/api/core/PhantomReachableTest.kt @@ -0,0 +1,27 @@ +package com.openlayer.api.core + +import org.assertj.core.api.Assertions.assertThat +import org.junit.jupiter.api.Test + +internal class PhantomReachableTest { + + @Test + fun closeWhenPhantomReachable_whenObservedIsGarbageCollected_closesCloseable() { + var closed = false + val closeable = AutoCloseable { closed = true } + + closeWhenPhantomReachable( + // Pass an inline object for the object to observe so that it becomes immediately + // unreachable. + Any(), + closeable + ) + + assertThat(closed).isFalse() + + System.gc() + Thread.sleep(3000) + + assertThat(closed).isTrue() + } +} diff --git a/openlayer-java-core/src/test/kotlin/com/openlayer/api/core/http/HeadersTest.kt b/openlayer-java-core/src/test/kotlin/com/openlayer/api/core/http/HeadersTest.kt new file mode 100644 index 0000000..0780679 --- /dev/null +++ b/openlayer-java-core/src/test/kotlin/com/openlayer/api/core/http/HeadersTest.kt @@ -0,0 +1,274 @@ +package com.openlayer.api.core.http + +import org.assertj.core.api.Assertions.assertThat +import org.assertj.core.api.Assertions.catchThrowable +import org.assertj.core.api.Assumptions.assumeThat +import org.junit.jupiter.params.ParameterizedTest +import org.junit.jupiter.params.provider.EnumSource + +internal class HeadersTest { + + enum class TestCase( + val headers: Headers, + val expectedMap: Map>, + val expectedSize: Int + ) { + EMPTY(Headers.builder().build(), expectedMap = mapOf(), expectedSize = 0), + PUT_ONE( + Headers.builder().put("name", "value").build(), + expectedMap = mapOf("name" to listOf("value")), + expectedSize = 1 + ), + PUT_MULTIPLE( + Headers.builder().put("name", listOf("value1", "value2")).build(), + expectedMap = mapOf("name" to listOf("value1", "value2")), + expectedSize = 2 + ), + MULTIPLE_PUT( + Headers.builder().put("name1", "value").put("name2", "value").build(), + expectedMap = mapOf("name1" to listOf("value"), "name2" to listOf("value")), + expectedSize = 2 + ), + MULTIPLE_PUT_SAME_NAME( + Headers.builder().put("name", "value1").put("name", "value2").build(), + expectedMap = mapOf("name" to listOf("value1", "value2")), + expectedSize = 2 + ), + MULTIPLE_PUT_MULTIPLE( + Headers.builder() + .put("name", listOf("value1", "value2")) + .put("name", listOf("value1", "value2")) + .build(), + expectedMap = mapOf("name" to listOf("value1", "value2", "value1", "value2")), + expectedSize = 4 + ), + PUT_CASE_INSENSITIVE( + Headers.builder() + .put("name", "value1") + .put("NAME", "value2") + .put("nAmE", "value3") + .build(), + expectedMap = mapOf("name" to listOf("value1", "value2", "value3")), + expectedSize = 3 + ), + PUT_ALL_MAP( + Headers.builder() + .putAll( + mapOf( + "name1" to listOf("value1", "value2"), + "name2" to listOf("value1", "value2") + ) + ) + .build(), + expectedMap = + mapOf("name1" to listOf("value1", "value2"), "name2" to listOf("value1", "value2")), + expectedSize = 4 + ), + PUT_ALL_HEADERS( + Headers.builder().putAll(Headers.builder().put("name", "value").build()).build(), + expectedMap = mapOf("name" to listOf("value")), + expectedSize = 1 + ), + PUT_ALL_CASE_INSENSITIVE( + Headers.builder() + .putAll( + mapOf( + "name" to listOf("value1"), + "NAME" to listOf("value2"), + "nAmE" to listOf("value3") + ) + ) + .build(), + expectedMap = mapOf("name" to listOf("value1", "value2", "value3")), + expectedSize = 3 + ), + REMOVE_ABSENT( + Headers.builder().remove("name").build(), + expectedMap = mapOf(), + expectedSize = 0 + ), + REMOVE_PRESENT_ONE( + Headers.builder().put("name", "value").remove("name").build(), + expectedMap = mapOf(), + expectedSize = 0 + ), + REMOVE_PRESENT_MULTIPLE( + Headers.builder().put("name", listOf("value1", "value2")).remove("name").build(), + expectedMap = mapOf(), + expectedSize = 0 + ), + REMOVE_CASE_INSENSITIVE( + Headers.builder().put("name", listOf("value1", "value2")).remove("NAME").build(), + expectedMap = mapOf(), + expectedSize = 0 + ), + REMOVE_ALL( + Headers.builder() + .put("name1", "value") + .put("name3", "value") + .removeAll(setOf("name1", "name2", "name3")) + .build(), + expectedMap = mapOf(), + expectedSize = 0 + ), + REMOVE_ALL_CASE_INSENSITIVE( + Headers.builder() + .put("name1", "value") + .put("name3", "value") + .removeAll(setOf("NAME1", "nAmE3")) + .build(), + expectedMap = mapOf(), + expectedSize = 0 + ), + CLEAR( + Headers.builder().put("name1", "value").put("name2", "value").clear().build(), + expectedMap = mapOf(), + expectedSize = 0 + ), + REPLACE_ONE_ABSENT( + Headers.builder().replace("name", "value").build(), + expectedMap = mapOf("name" to listOf("value")), + expectedSize = 1 + ), + REPLACE_ONE_PRESENT_ONE( + Headers.builder().put("name", "value1").replace("name", "value2").build(), + expectedMap = mapOf("name" to listOf("value2")), + expectedSize = 1 + ), + REPLACE_ONE_PRESENT_MULTIPLE( + Headers.builder() + .put("name", listOf("value1", "value2")) + .replace("name", "value3") + .build(), + expectedMap = mapOf("name" to listOf("value3")), + expectedSize = 1 + ), + REPLACE_MULTIPLE_ABSENT( + Headers.builder().replace("name", listOf("value1", "value2")).build(), + expectedMap = mapOf("name" to listOf("value1", "value2")), + expectedSize = 2 + ), + REPLACE_MULTIPLE_PRESENT_ONE( + Headers.builder() + .put("name", "value1") + .replace("name", listOf("value2", "value3")) + .build(), + expectedMap = mapOf("name" to listOf("value2", "value3")), + expectedSize = 2 + ), + REPLACE_MULTIPLE_PRESENT_MULTIPLE( + Headers.builder() + .put("name", listOf("value1", "value2")) + .replace("name", listOf("value3", "value4")) + .build(), + expectedMap = mapOf("name" to listOf("value3", "value4")), + expectedSize = 2 + ), + REPLACE_CASE_INSENSITIVE( + Headers.builder() + .put("name", "value1") + .replace("NAME", listOf("value2", "value3")) + .build(), + expectedMap = mapOf("NAME" to listOf("value2", "value3")), + expectedSize = 2 + ), + REPLACE_ALL_MAP( + Headers.builder() + .put("name1", "value1") + .put("name2", "value1") + .put("name3", "value1") + .replaceAll(mapOf("name1" to listOf("value2"), "name3" to listOf("value2"))) + .build(), + expectedMap = + mapOf( + "name1" to listOf("value2"), + "name2" to listOf("value1"), + "name3" to listOf("value2") + ), + expectedSize = 3 + ), + REPLACE_ALL_HEADERS( + Headers.builder() + .put("name1", "value1") + .put("name2", "value1") + .put("name3", "value1") + .replaceAll(Headers.builder().put("name1", "value2").put("name3", "value2").build()) + .build(), + expectedMap = + mapOf( + "name1" to listOf("value2"), + "name2" to listOf("value1"), + "name3" to listOf("value2") + ), + expectedSize = 3 + ), + REPLACE_ALL_CASE_INSENSITIVE( + Headers.builder() + .put("name1", "value1") + .put("name2", "value1") + .replaceAll(mapOf("NAME1" to listOf("value2"), "nAmE2" to listOf("value2"))) + .build(), + expectedMap = mapOf("NAME1" to listOf("value2"), "nAmE2" to listOf("value2")), + expectedSize = 2 + ) + } + + @ParameterizedTest + @EnumSource + fun namesAndValues(testCase: TestCase) { + val map = mutableMapOf>() + val headers = testCase.headers + headers.names().forEach { name -> map[name] = headers.values(name) } + + assertThat(map).isEqualTo(testCase.expectedMap) + } + + @ParameterizedTest + @EnumSource + fun caseInsensitiveNames(testCase: TestCase) { + val headers = testCase.headers + + for (name in headers.names()) { + assertThat(headers.values(name)).isEqualTo(headers.values(name.lowercase())) + assertThat(headers.values(name)).isEqualTo(headers.values(name.uppercase())) + } + } + + @ParameterizedTest + @EnumSource + fun size(testCase: TestCase) { + val size = testCase.headers.size + + assertThat(size).isEqualTo(testCase.expectedSize) + } + + @ParameterizedTest + @EnumSource + fun namesAreImmutable(testCase: TestCase) { + val headers = testCase.headers + val headerNamesCopy = headers.names().toSet() + + val throwable = catchThrowable { + (headers.names() as MutableSet).add("another name") + } + + assertThat(throwable).isInstanceOf(UnsupportedOperationException::class.java) + assertThat(headers.names()).isEqualTo(headerNamesCopy) + } + + @ParameterizedTest + @EnumSource + fun valuesAreImmutable(testCase: TestCase) { + val headers = testCase.headers + assumeThat(headers.size).isNotEqualTo(0) + val name = headers.names().first() + val headerValuesCopy = headers.values(name).toList() + + val throwable = catchThrowable { + (headers.values(name) as MutableList).add("another value") + } + + assertThat(throwable).isInstanceOf(UnsupportedOperationException::class.java) + assertThat(headers.values(name)).isEqualTo(headerValuesCopy) + } +} diff --git a/openlayer-java-core/src/test/kotlin/com/openlayer/api/core/http/HttpRequestTest.kt b/openlayer-java-core/src/test/kotlin/com/openlayer/api/core/http/HttpRequestTest.kt deleted file mode 100644 index fe7fc1c..0000000 --- a/openlayer-java-core/src/test/kotlin/com/openlayer/api/core/http/HttpRequestTest.kt +++ /dev/null @@ -1,22 +0,0 @@ -package com.openlayer.api.core.http - -import org.assertj.core.api.Assertions.assertThat -import org.junit.jupiter.api.Test - -internal class HttpRequestTest { - - @Test - fun caseInsensitiveHeadersAccessors() { - val request = - HttpRequest.builder() - .method(HttpMethod.POST) - .putHeader("something_lowercase", "lowercase") - .putHeader("Something_Capitalized", "Capitalized") - .putHeader("SOMETHING_UPPERCASE", "UPPERCASE") - .build() - assertThat(request.headers.get("SOMETHING_LOWERCASE").getOrNull(0)).isEqualTo("lowercase") - assertThat(request.headers.get("something_capitalized").getOrNull(0)) - .isEqualTo("Capitalized") - assertThat(request.headers.get("Something_Uppercase").getOrNull(0)).isEqualTo("UPPERCASE") - } -} diff --git a/openlayer-java-core/src/test/kotlin/com/openlayer/api/core/http/QueryParamsTest.kt b/openlayer-java-core/src/test/kotlin/com/openlayer/api/core/http/QueryParamsTest.kt new file mode 100644 index 0000000..7db575e --- /dev/null +++ b/openlayer-java-core/src/test/kotlin/com/openlayer/api/core/http/QueryParamsTest.kt @@ -0,0 +1,212 @@ +package com.openlayer.api.core.http + +import org.assertj.core.api.Assertions.assertThat +import org.assertj.core.api.Assertions.catchThrowable +import org.assertj.core.api.Assumptions.assumeThat +import org.junit.jupiter.params.ParameterizedTest +import org.junit.jupiter.params.provider.EnumSource + +internal class QueryParamsTest { + + enum class TestCase( + val queryParams: QueryParams, + val expectedMap: Map>, + val expectedSize: Int + ) { + EMPTY(QueryParams.builder().build(), expectedMap = mapOf(), expectedSize = 0), + PUT_ONE( + QueryParams.builder().put("key", "value").build(), + expectedMap = mapOf("key" to listOf("value")), + expectedSize = 1 + ), + PUT_MULTIPLE( + QueryParams.builder().put("key", listOf("value1", "value2")).build(), + expectedMap = mapOf("key" to listOf("value1", "value2")), + expectedSize = 2 + ), + MULTIPLE_PUT( + QueryParams.builder().put("key1", "value").put("key2", "value").build(), + expectedMap = mapOf("key1" to listOf("value"), "key2" to listOf("value")), + expectedSize = 2 + ), + MULTIPLE_PUT_SAME_NAME( + QueryParams.builder().put("key", "value1").put("key", "value2").build(), + expectedMap = mapOf("key" to listOf("value1", "value2")), + expectedSize = 2 + ), + MULTIPLE_PUT_MULTIPLE( + QueryParams.builder() + .put("key", listOf("value1", "value2")) + .put("key", listOf("value1", "value2")) + .build(), + expectedMap = mapOf("key" to listOf("value1", "value2", "value1", "value2")), + expectedSize = 4 + ), + PUT_ALL_MAP( + QueryParams.builder() + .putAll( + mapOf( + "key1" to listOf("value1", "value2"), + "key2" to listOf("value1", "value2") + ) + ) + .build(), + expectedMap = + mapOf("key1" to listOf("value1", "value2"), "key2" to listOf("value1", "value2")), + expectedSize = 4 + ), + PUT_ALL_HEADERS( + QueryParams.builder().putAll(QueryParams.builder().put("key", "value").build()).build(), + expectedMap = mapOf("key" to listOf("value")), + expectedSize = 1 + ), + REMOVE_ABSENT( + QueryParams.builder().remove("key").build(), + expectedMap = mapOf(), + expectedSize = 0 + ), + REMOVE_PRESENT_ONE( + QueryParams.builder().put("key", "value").remove("key").build(), + expectedMap = mapOf(), + expectedSize = 0 + ), + REMOVE_PRESENT_MULTIPLE( + QueryParams.builder().put("key", listOf("value1", "value2")).remove("key").build(), + expectedMap = mapOf(), + expectedSize = 0 + ), + REMOVE_ALL( + QueryParams.builder() + .put("key1", "value") + .put("key3", "value") + .removeAll(setOf("key1", "key2", "key3")) + .build(), + expectedMap = mapOf(), + expectedSize = 0 + ), + CLEAR( + QueryParams.builder().put("key1", "value").put("key2", "value").clear().build(), + expectedMap = mapOf(), + expectedSize = 0 + ), + REPLACE_ONE_ABSENT( + QueryParams.builder().replace("key", "value").build(), + expectedMap = mapOf("key" to listOf("value")), + expectedSize = 1 + ), + REPLACE_ONE_PRESENT_ONE( + QueryParams.builder().put("key", "value1").replace("key", "value2").build(), + expectedMap = mapOf("key" to listOf("value2")), + expectedSize = 1 + ), + REPLACE_ONE_PRESENT_MULTIPLE( + QueryParams.builder() + .put("key", listOf("value1", "value2")) + .replace("key", "value3") + .build(), + expectedMap = mapOf("key" to listOf("value3")), + expectedSize = 1 + ), + REPLACE_MULTIPLE_ABSENT( + QueryParams.builder().replace("key", listOf("value1", "value2")).build(), + expectedMap = mapOf("key" to listOf("value1", "value2")), + expectedSize = 2 + ), + REPLACE_MULTIPLE_PRESENT_ONE( + QueryParams.builder() + .put("key", "value1") + .replace("key", listOf("value2", "value3")) + .build(), + expectedMap = mapOf("key" to listOf("value2", "value3")), + expectedSize = 2 + ), + REPLACE_MULTIPLE_PRESENT_MULTIPLE( + QueryParams.builder() + .put("key", listOf("value1", "value2")) + .replace("key", listOf("value3", "value4")) + .build(), + expectedMap = mapOf("key" to listOf("value3", "value4")), + expectedSize = 2 + ), + REPLACE_ALL_MAP( + QueryParams.builder() + .put("key1", "value1") + .put("key2", "value1") + .put("key3", "value1") + .replaceAll(mapOf("key1" to listOf("value2"), "key3" to listOf("value2"))) + .build(), + expectedMap = + mapOf( + "key1" to listOf("value2"), + "key2" to listOf("value1"), + "key3" to listOf("value2") + ), + expectedSize = 3 + ), + REPLACE_ALL_HEADERS( + QueryParams.builder() + .put("key1", "value1") + .put("key2", "value1") + .put("key3", "value1") + .replaceAll( + QueryParams.builder().put("key1", "value2").put("key3", "value2").build() + ) + .build(), + expectedMap = + mapOf( + "key1" to listOf("value2"), + "key2" to listOf("value1"), + "key3" to listOf("value2") + ), + expectedSize = 3 + ) + } + + @ParameterizedTest + @EnumSource + fun keysAndValues(testCase: TestCase) { + val map = mutableMapOf>() + val queryParams = testCase.queryParams + queryParams.keys().forEach { key -> map[key] = queryParams.values(key) } + + assertThat(map).isEqualTo(testCase.expectedMap) + } + + @ParameterizedTest + @EnumSource + fun size(testCase: TestCase) { + val size = testCase.queryParams.size + + assertThat(size).isEqualTo(testCase.expectedSize) + } + + @ParameterizedTest + @EnumSource + fun keysAreImmutable(testCase: TestCase) { + val queryParams = testCase.queryParams + val queryParamKeysCopy = queryParams.keys().toSet() + + val throwable = catchThrowable { + (queryParams.keys() as MutableSet).add("another key") + } + + assertThat(throwable).isInstanceOf(UnsupportedOperationException::class.java) + assertThat(queryParams.keys()).isEqualTo(queryParamKeysCopy) + } + + @ParameterizedTest + @EnumSource + fun valuesAreImmutable(testCase: TestCase) { + val queryParams = testCase.queryParams + assumeThat(queryParams.size).isNotEqualTo(0) + val key = queryParams.keys().first() + val queryParamValuesCopy = queryParams.values(key).toList() + + val throwable = catchThrowable { + (queryParams.values(key) as MutableList).add("another value") + } + + assertThat(throwable).isInstanceOf(UnsupportedOperationException::class.java) + assertThat(queryParams.values(key)).isEqualTo(queryParamValuesCopy) + } +} diff --git a/openlayer-java-core/src/test/kotlin/com/openlayer/api/core/http/RetryingHttpClientTest.kt b/openlayer-java-core/src/test/kotlin/com/openlayer/api/core/http/RetryingHttpClientTest.kt index ce97799..c6ccd9b 100644 --- a/openlayer-java-core/src/test/kotlin/com/openlayer/api/core/http/RetryingHttpClientTest.kt +++ b/openlayer-java-core/src/test/kotlin/com/openlayer/api/core/http/RetryingHttpClientTest.kt @@ -8,6 +8,8 @@ import com.openlayer.api.client.okhttp.OkHttpClient import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test +import org.junit.jupiter.params.ParameterizedTest +import org.junit.jupiter.params.provider.ValueSource @WireMockTest internal class RetryingHttpClientTest { @@ -50,8 +52,9 @@ internal class RetryingHttpClientTest { verify(1, postRequestedFor(urlPathEqualTo("/something"))) } - @Test - fun retryAfterHeader() { + @ParameterizedTest + @ValueSource(booleans = [false, true]) + fun retryAfterHeader(async: Boolean) { val request = HttpRequest.builder().method(HttpMethod.POST).addPathSegment("something").build() stubFor( @@ -79,9 +82,67 @@ internal class RetryingHttpClientTest { ) val retryingClient = RetryingHttpClient.builder().httpClient(httpClient).maxRetries(2).build() - val response = retryingClient.execute(request) + + val response = + if (async) retryingClient.executeAsync(request).get() + else retryingClient.execute(request) + assertThat(response.statusCode()).isEqualTo(200) - verify(3, postRequestedFor(urlPathEqualTo("/something"))) + verify( + 1, + postRequestedFor(urlPathEqualTo("/something")) + .withHeader("x-stainless-retry-count", equalTo("0")) + ) + verify( + 1, + postRequestedFor(urlPathEqualTo("/something")) + .withHeader("x-stainless-retry-count", equalTo("1")) + ) + verify( + 1, + postRequestedFor(urlPathEqualTo("/something")) + .withHeader("x-stainless-retry-count", equalTo("2")) + ) + } + + @ParameterizedTest + @ValueSource(booleans = [false, true]) + fun overwriteRetryCountHeader(async: Boolean) { + val request = + HttpRequest.builder() + .method(HttpMethod.POST) + .addPathSegment("something") + .putHeader("x-stainless-retry-count", "42") + .build() + stubFor( + post(urlPathEqualTo("/something")) + .inScenario("foo") // first we fail with a retry after header given as a date + .whenScenarioStateIs(Scenario.STARTED) + .willReturn( + serviceUnavailable().withHeader("Retry-After", "Wed, 21 Oct 2015 07:28:00 GMT") + ) + .willSetStateTo("RETRY_AFTER_DATE") + ) + stubFor( + post(urlPathEqualTo("/something")) + .inScenario("foo") // then we return a success + .whenScenarioStateIs("RETRY_AFTER_DATE") + .willReturn(ok()) + .willSetStateTo("COMPLETED") + ) + val retryingClient = + RetryingHttpClient.builder().httpClient(httpClient).maxRetries(2).build() + + val response = + if (async) retryingClient.executeAsync(request).get() + else retryingClient.execute(request) + + assertThat(response.statusCode()).isEqualTo(200) + verify( + 2, + postRequestedFor(urlPathEqualTo("/something")) + .withHeader("x-stainless-retry-count", equalTo("42")) + ) } @Test diff --git a/openlayer-java-core/src/test/kotlin/com/openlayer/api/core/http/SerializerTest.kt b/openlayer-java-core/src/test/kotlin/com/openlayer/api/core/http/SerializerTest.kt index a2f9465..1acef18 100644 --- a/openlayer-java-core/src/test/kotlin/com/openlayer/api/core/http/SerializerTest.kt +++ b/openlayer-java-core/src/test/kotlin/com/openlayer/api/core/http/SerializerTest.kt @@ -92,7 +92,7 @@ internal class SerializerTest { fun build(): ClassWithBooleanFieldPrefixedWithIs = ClassWithBooleanFieldPrefixedWithIs( isActive, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } } diff --git a/openlayer-java-core/src/test/kotlin/com/openlayer/api/models/CommitTestResultListParamsTest.kt b/openlayer-java-core/src/test/kotlin/com/openlayer/api/models/CommitTestResultListParamsTest.kt index a011d78..01f9c0f 100644 --- a/openlayer-java-core/src/test/kotlin/com/openlayer/api/models/CommitTestResultListParamsTest.kt +++ b/openlayer-java-core/src/test/kotlin/com/openlayer/api/models/CommitTestResultListParamsTest.kt @@ -2,6 +2,7 @@ package com.openlayer.api.models +import com.openlayer.api.core.http.QueryParams import com.openlayer.api.models.* import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test @@ -31,13 +32,13 @@ class CommitTestResultListParamsTest { .status(CommitTestResultListParams.Status.RUNNING) .type(CommitTestResultListParams.Type.INTEGRITY) .build() - val expected = mutableMapOf>() - expected.put("includeArchived", listOf("true")) - expected.put("page", listOf("123")) - expected.put("perPage", listOf("100")) - expected.put("status", listOf(CommitTestResultListParams.Status.RUNNING.toString())) - expected.put("type", listOf(CommitTestResultListParams.Type.INTEGRITY.toString())) - assertThat(params.getQueryParams()).isEqualTo(expected) + val expected = QueryParams.builder() + expected.put("includeArchived", "true") + expected.put("page", "123") + expected.put("perPage", "100") + expected.put("status", CommitTestResultListParams.Status.RUNNING.toString()) + expected.put("type", CommitTestResultListParams.Type.INTEGRITY.toString()) + assertThat(params.getQueryParams()).isEqualTo(expected.build()) } @Test @@ -46,8 +47,8 @@ class CommitTestResultListParamsTest { CommitTestResultListParams.builder() .projectVersionId("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") .build() - val expected = mutableMapOf>() - assertThat(params.getQueryParams()).isEqualTo(expected) + val expected = QueryParams.builder() + assertThat(params.getQueryParams()).isEqualTo(expected.build()) } @Test diff --git a/openlayer-java-core/src/test/kotlin/com/openlayer/api/models/CommitTestResultListResponseTest.kt b/openlayer-java-core/src/test/kotlin/com/openlayer/api/models/CommitTestResultListResponseTest.kt index 73bb4f1..13d9736 100644 --- a/openlayer-java-core/src/test/kotlin/com/openlayer/api/models/CommitTestResultListResponseTest.kt +++ b/openlayer-java-core/src/test/kotlin/com/openlayer/api/models/CommitTestResultListResponseTest.kt @@ -56,7 +56,7 @@ class CommitTestResultListResponseTest { .value( CommitTestResultListResponse.Item.Goal.Threshold .Value - .ofDouble(42.23) + .ofNumber(42.23) ) .build() ) @@ -119,7 +119,7 @@ class CommitTestResultListResponseTest { .operator("<=") .value( CommitTestResultListResponse.Item.Goal.Threshold.Value - .ofDouble(42.23) + .ofNumber(42.23) ) .build() ) diff --git a/openlayer-java-core/src/test/kotlin/com/openlayer/api/models/InferencePipelineRowUpdateParamsTest.kt b/openlayer-java-core/src/test/kotlin/com/openlayer/api/models/InferencePipelineRowUpdateParamsTest.kt index f4a70bf..85150f7 100644 --- a/openlayer-java-core/src/test/kotlin/com/openlayer/api/models/InferencePipelineRowUpdateParamsTest.kt +++ b/openlayer-java-core/src/test/kotlin/com/openlayer/api/models/InferencePipelineRowUpdateParamsTest.kt @@ -3,6 +3,7 @@ package com.openlayer.api.models import com.openlayer.api.core.JsonValue +import com.openlayer.api.core.http.QueryParams import com.openlayer.api.models.* import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test @@ -44,9 +45,9 @@ class InferencePipelineRowUpdateParamsTest { ) .inferenceId("inferenceId") .build() - val expected = mutableMapOf>() - expected.put("inferenceId", listOf("inferenceId")) - assertThat(params.getQueryParams()).isEqualTo(expected) + val expected = QueryParams.builder() + expected.put("inferenceId", "inferenceId") + assertThat(params.getQueryParams()).isEqualTo(expected.build()) } @Test @@ -57,9 +58,9 @@ class InferencePipelineRowUpdateParamsTest { .row(JsonValue.from(mapOf())) .inferenceId("inferenceId") .build() - val expected = mutableMapOf>() - expected.put("inferenceId", listOf("inferenceId")) - assertThat(params.getQueryParams()).isEqualTo(expected) + val expected = QueryParams.builder() + expected.put("inferenceId", "inferenceId") + assertThat(params.getQueryParams()).isEqualTo(expected.build()) } @Test diff --git a/openlayer-java-core/src/test/kotlin/com/openlayer/api/models/InferencePipelineTestResultListParamsTest.kt b/openlayer-java-core/src/test/kotlin/com/openlayer/api/models/InferencePipelineTestResultListParamsTest.kt index 6de2ac0..e71d307 100644 --- a/openlayer-java-core/src/test/kotlin/com/openlayer/api/models/InferencePipelineTestResultListParamsTest.kt +++ b/openlayer-java-core/src/test/kotlin/com/openlayer/api/models/InferencePipelineTestResultListParamsTest.kt @@ -2,6 +2,7 @@ package com.openlayer.api.models +import com.openlayer.api.core.http.QueryParams import com.openlayer.api.models.* import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test @@ -29,18 +30,12 @@ class InferencePipelineTestResultListParamsTest { .status(InferencePipelineTestResultListParams.Status.RUNNING) .type(InferencePipelineTestResultListParams.Type.INTEGRITY) .build() - val expected = mutableMapOf>() - expected.put("page", listOf("123")) - expected.put("perPage", listOf("100")) - expected.put( - "status", - listOf(InferencePipelineTestResultListParams.Status.RUNNING.toString()) - ) - expected.put( - "type", - listOf(InferencePipelineTestResultListParams.Type.INTEGRITY.toString()) - ) - assertThat(params.getQueryParams()).isEqualTo(expected) + val expected = QueryParams.builder() + expected.put("page", "123") + expected.put("perPage", "100") + expected.put("status", InferencePipelineTestResultListParams.Status.RUNNING.toString()) + expected.put("type", InferencePipelineTestResultListParams.Type.INTEGRITY.toString()) + assertThat(params.getQueryParams()).isEqualTo(expected.build()) } @Test @@ -49,8 +44,8 @@ class InferencePipelineTestResultListParamsTest { InferencePipelineTestResultListParams.builder() .inferencePipelineId("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") .build() - val expected = mutableMapOf>() - assertThat(params.getQueryParams()).isEqualTo(expected) + val expected = QueryParams.builder() + assertThat(params.getQueryParams()).isEqualTo(expected.build()) } @Test diff --git a/openlayer-java-core/src/test/kotlin/com/openlayer/api/models/InferencePipelineTestResultListResponseTest.kt b/openlayer-java-core/src/test/kotlin/com/openlayer/api/models/InferencePipelineTestResultListResponseTest.kt index 9395377..96afb47 100644 --- a/openlayer-java-core/src/test/kotlin/com/openlayer/api/models/InferencePipelineTestResultListResponseTest.kt +++ b/openlayer-java-core/src/test/kotlin/com/openlayer/api/models/InferencePipelineTestResultListResponseTest.kt @@ -59,7 +59,7 @@ class InferencePipelineTestResultListResponseTest { .Goal .Threshold .Value - .ofDouble(42.23) + .ofNumber(42.23) ) .build() ) @@ -125,7 +125,7 @@ class InferencePipelineTestResultListResponseTest { InferencePipelineTestResultListResponse.Item.Goal .Threshold .Value - .ofDouble(42.23) + .ofNumber(42.23) ) .build() ) diff --git a/openlayer-java-core/src/test/kotlin/com/openlayer/api/models/ProjectCommitCreateParamsTest.kt b/openlayer-java-core/src/test/kotlin/com/openlayer/api/models/ProjectCommitCreateParamsTest.kt new file mode 100644 index 0000000..1fff953 --- /dev/null +++ b/openlayer-java-core/src/test/kotlin/com/openlayer/api/models/ProjectCommitCreateParamsTest.kt @@ -0,0 +1,137 @@ +// File generated from our OpenAPI spec by Stainless. + +package com.openlayer.api.models + +import com.openlayer.api.models.* +import java.time.OffsetDateTime +import org.assertj.core.api.Assertions.assertThat +import org.junit.jupiter.api.Test + +class ProjectCommitCreateParamsTest { + + @Test + fun createProjectCommitCreateParams() { + ProjectCommitCreateParams.builder() + .projectId("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .commit( + ProjectCommitCreateParams.Commit.builder() + .id("3fa85f64-5717-4562-b3fc-2c963f66afa6") + .authorId("589ece63-49a2-41b4-98e1-10547761d4b0") + .fileSize(123L) + .message("Updated the prompt.") + .mlModelId("3fa85f64-5717-4562-b3fc-2c963f66afa6") + .storageUri("s3://...") + .trainingDatasetId("3fa85f64-5717-4562-b3fc-2c963f66afa6") + .validationDatasetId("3fa85f64-5717-4562-b3fc-2c963f66afa6") + .dateCreated(OffsetDateTime.parse("2024-03-22T11:31:01.185Z")) + .gitCommitRef("main") + .gitCommitSha(123L) + .gitCommitUrl("gitCommitUrl") + .build() + ) + .storageUri("s3://...") + .archived(true) + .deploymentStatus("Deployed") + .build() + } + + @Test + fun getBody() { + val params = + ProjectCommitCreateParams.builder() + .projectId("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .commit( + ProjectCommitCreateParams.Commit.builder() + .id("3fa85f64-5717-4562-b3fc-2c963f66afa6") + .authorId("589ece63-49a2-41b4-98e1-10547761d4b0") + .fileSize(123L) + .message("Updated the prompt.") + .mlModelId("3fa85f64-5717-4562-b3fc-2c963f66afa6") + .storageUri("s3://...") + .trainingDatasetId("3fa85f64-5717-4562-b3fc-2c963f66afa6") + .validationDatasetId("3fa85f64-5717-4562-b3fc-2c963f66afa6") + .dateCreated(OffsetDateTime.parse("2024-03-22T11:31:01.185Z")) + .gitCommitRef("main") + .gitCommitSha(123L) + .gitCommitUrl("gitCommitUrl") + .build() + ) + .storageUri("s3://...") + .archived(true) + .deploymentStatus("Deployed") + .build() + val body = params.getBody() + assertThat(body).isNotNull + assertThat(body.commit()) + .isEqualTo( + ProjectCommitCreateParams.Commit.builder() + .id("3fa85f64-5717-4562-b3fc-2c963f66afa6") + .authorId("589ece63-49a2-41b4-98e1-10547761d4b0") + .fileSize(123L) + .message("Updated the prompt.") + .mlModelId("3fa85f64-5717-4562-b3fc-2c963f66afa6") + .storageUri("s3://...") + .trainingDatasetId("3fa85f64-5717-4562-b3fc-2c963f66afa6") + .validationDatasetId("3fa85f64-5717-4562-b3fc-2c963f66afa6") + .dateCreated(OffsetDateTime.parse("2024-03-22T11:31:01.185Z")) + .gitCommitRef("main") + .gitCommitSha(123L) + .gitCommitUrl("gitCommitUrl") + .build() + ) + assertThat(body.storageUri()).isEqualTo("s3://...") + assertThat(body.archived()).isEqualTo(true) + assertThat(body.deploymentStatus()).isEqualTo("Deployed") + } + + @Test + fun getBodyWithoutOptionalFields() { + val params = + ProjectCommitCreateParams.builder() + .projectId("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .commit( + ProjectCommitCreateParams.Commit.builder() + .id("3fa85f64-5717-4562-b3fc-2c963f66afa6") + .authorId("589ece63-49a2-41b4-98e1-10547761d4b0") + .message("Updated the prompt.") + .storageUri("s3://...") + .build() + ) + .storageUri("s3://...") + .build() + val body = params.getBody() + assertThat(body).isNotNull + assertThat(body.commit()) + .isEqualTo( + ProjectCommitCreateParams.Commit.builder() + .id("3fa85f64-5717-4562-b3fc-2c963f66afa6") + .authorId("589ece63-49a2-41b4-98e1-10547761d4b0") + .message("Updated the prompt.") + .storageUri("s3://...") + .build() + ) + assertThat(body.storageUri()).isEqualTo("s3://...") + } + + @Test + fun getPathParam() { + val params = + ProjectCommitCreateParams.builder() + .projectId("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .commit( + ProjectCommitCreateParams.Commit.builder() + .id("3fa85f64-5717-4562-b3fc-2c963f66afa6") + .authorId("589ece63-49a2-41b4-98e1-10547761d4b0") + .message("Updated the prompt.") + .storageUri("s3://...") + .build() + ) + .storageUri("s3://...") + .build() + assertThat(params).isNotNull + // path param "projectId" + assertThat(params.getPathParam(0)).isEqualTo("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + // out-of-bound path param + assertThat(params.getPathParam(1)).isEqualTo("") + } +} diff --git a/openlayer-java-core/src/test/kotlin/com/openlayer/api/models/ProjectCommitCreateResponseTest.kt b/openlayer-java-core/src/test/kotlin/com/openlayer/api/models/ProjectCommitCreateResponseTest.kt new file mode 100644 index 0000000..4a36d27 --- /dev/null +++ b/openlayer-java-core/src/test/kotlin/com/openlayer/api/models/ProjectCommitCreateResponseTest.kt @@ -0,0 +1,105 @@ +// File generated from our OpenAPI spec by Stainless. + +package com.openlayer.api.models + +import java.time.OffsetDateTime +import org.assertj.core.api.Assertions.assertThat +import org.junit.jupiter.api.Test + +class ProjectCommitCreateResponseTest { + + @Test + fun createProjectCommitCreateResponse() { + val projectCommitCreateResponse = + ProjectCommitCreateResponse.builder() + .id("3fa85f64-5717-4562-b3fc-2c963f66afa6") + .commit( + ProjectCommitCreateResponse.Commit.builder() + .id("3fa85f64-5717-4562-b3fc-2c963f66afa6") + .authorId("589ece63-49a2-41b4-98e1-10547761d4b0") + .fileSize(123L) + .message("Updated the prompt.") + .mlModelId("3fa85f64-5717-4562-b3fc-2c963f66afa6") + .storageUri("s3://...") + .trainingDatasetId("3fa85f64-5717-4562-b3fc-2c963f66afa6") + .validationDatasetId("3fa85f64-5717-4562-b3fc-2c963f66afa6") + .dateCreated(OffsetDateTime.parse("2024-03-22T11:31:01.185Z")) + .gitCommitRef("main") + .gitCommitSha(123L) + .gitCommitUrl("gitCommitUrl") + .build() + ) + .dateArchived(OffsetDateTime.parse("2024-03-22T11:31:01.185Z")) + .dateCreated(OffsetDateTime.parse("2024-03-22T11:31:01.185Z")) + .failingGoalCount(123L) + .mlModelId("3fa85f64-5717-4562-b3fc-2c963f66afa6") + .passingGoalCount(123L) + .projectId("3fa85f64-5717-4562-b3fc-2c963f66afa6") + .status(ProjectCommitCreateResponse.Status.QUEUED) + .statusMessage("Commit successfully processed.") + .storageUri("s3://...") + .totalGoalCount(123L) + .trainingDatasetId("3fa85f64-5717-4562-b3fc-2c963f66afa6") + .validationDatasetId("3fa85f64-5717-4562-b3fc-2c963f66afa6") + .archived(true) + .deploymentStatus("Deployed") + .links( + ProjectCommitCreateResponse.Links.builder() + .app( + "https://app.openlayer.com/myWorkspace/3fa85f64-5717-4562-b3fc-2c963f66afa6" + ) + .build() + ) + .build() + assertThat(projectCommitCreateResponse).isNotNull + assertThat(projectCommitCreateResponse.id()) + .isEqualTo("3fa85f64-5717-4562-b3fc-2c963f66afa6") + assertThat(projectCommitCreateResponse.commit()) + .isEqualTo( + ProjectCommitCreateResponse.Commit.builder() + .id("3fa85f64-5717-4562-b3fc-2c963f66afa6") + .authorId("589ece63-49a2-41b4-98e1-10547761d4b0") + .fileSize(123L) + .message("Updated the prompt.") + .mlModelId("3fa85f64-5717-4562-b3fc-2c963f66afa6") + .storageUri("s3://...") + .trainingDatasetId("3fa85f64-5717-4562-b3fc-2c963f66afa6") + .validationDatasetId("3fa85f64-5717-4562-b3fc-2c963f66afa6") + .dateCreated(OffsetDateTime.parse("2024-03-22T11:31:01.185Z")) + .gitCommitRef("main") + .gitCommitSha(123L) + .gitCommitUrl("gitCommitUrl") + .build() + ) + assertThat(projectCommitCreateResponse.dateArchived()) + .contains(OffsetDateTime.parse("2024-03-22T11:31:01.185Z")) + assertThat(projectCommitCreateResponse.dateCreated()) + .isEqualTo(OffsetDateTime.parse("2024-03-22T11:31:01.185Z")) + assertThat(projectCommitCreateResponse.failingGoalCount()).isEqualTo(123L) + assertThat(projectCommitCreateResponse.mlModelId()) + .contains("3fa85f64-5717-4562-b3fc-2c963f66afa6") + assertThat(projectCommitCreateResponse.passingGoalCount()).isEqualTo(123L) + assertThat(projectCommitCreateResponse.projectId()) + .isEqualTo("3fa85f64-5717-4562-b3fc-2c963f66afa6") + assertThat(projectCommitCreateResponse.status()) + .isEqualTo(ProjectCommitCreateResponse.Status.QUEUED) + assertThat(projectCommitCreateResponse.statusMessage()) + .contains("Commit successfully processed.") + assertThat(projectCommitCreateResponse.storageUri()).isEqualTo("s3://...") + assertThat(projectCommitCreateResponse.totalGoalCount()).isEqualTo(123L) + assertThat(projectCommitCreateResponse.trainingDatasetId()) + .contains("3fa85f64-5717-4562-b3fc-2c963f66afa6") + assertThat(projectCommitCreateResponse.validationDatasetId()) + .contains("3fa85f64-5717-4562-b3fc-2c963f66afa6") + assertThat(projectCommitCreateResponse.archived()).contains(true) + assertThat(projectCommitCreateResponse.deploymentStatus()).contains("Deployed") + assertThat(projectCommitCreateResponse.links()) + .contains( + ProjectCommitCreateResponse.Links.builder() + .app( + "https://app.openlayer.com/myWorkspace/3fa85f64-5717-4562-b3fc-2c963f66afa6" + ) + .build() + ) + } +} diff --git a/openlayer-java-core/src/test/kotlin/com/openlayer/api/models/ProjectCommitListParamsTest.kt b/openlayer-java-core/src/test/kotlin/com/openlayer/api/models/ProjectCommitListParamsTest.kt index 17d2e0a..1b5e9c5 100644 --- a/openlayer-java-core/src/test/kotlin/com/openlayer/api/models/ProjectCommitListParamsTest.kt +++ b/openlayer-java-core/src/test/kotlin/com/openlayer/api/models/ProjectCommitListParamsTest.kt @@ -2,6 +2,7 @@ package com.openlayer.api.models +import com.openlayer.api.core.http.QueryParams import com.openlayer.api.models.* import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test @@ -25,10 +26,10 @@ class ProjectCommitListParamsTest { .page(123L) .perPage(100L) .build() - val expected = mutableMapOf>() - expected.put("page", listOf("123")) - expected.put("perPage", listOf("100")) - assertThat(params.getQueryParams()).isEqualTo(expected) + val expected = QueryParams.builder() + expected.put("page", "123") + expected.put("perPage", "100") + assertThat(params.getQueryParams()).isEqualTo(expected.build()) } @Test @@ -37,8 +38,8 @@ class ProjectCommitListParamsTest { ProjectCommitListParams.builder() .projectId("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") .build() - val expected = mutableMapOf>() - assertThat(params.getQueryParams()).isEqualTo(expected) + val expected = QueryParams.builder() + assertThat(params.getQueryParams()).isEqualTo(expected.build()) } @Test diff --git a/openlayer-java-core/src/test/kotlin/com/openlayer/api/models/ProjectInferencePipelineListParamsTest.kt b/openlayer-java-core/src/test/kotlin/com/openlayer/api/models/ProjectInferencePipelineListParamsTest.kt index 671b802..0197e06 100644 --- a/openlayer-java-core/src/test/kotlin/com/openlayer/api/models/ProjectInferencePipelineListParamsTest.kt +++ b/openlayer-java-core/src/test/kotlin/com/openlayer/api/models/ProjectInferencePipelineListParamsTest.kt @@ -2,6 +2,7 @@ package com.openlayer.api.models +import com.openlayer.api.core.http.QueryParams import com.openlayer.api.models.* import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test @@ -27,11 +28,11 @@ class ProjectInferencePipelineListParamsTest { .page(123L) .perPage(100L) .build() - val expected = mutableMapOf>() - expected.put("name", listOf("name")) - expected.put("page", listOf("123")) - expected.put("perPage", listOf("100")) - assertThat(params.getQueryParams()).isEqualTo(expected) + val expected = QueryParams.builder() + expected.put("name", "name") + expected.put("page", "123") + expected.put("perPage", "100") + assertThat(params.getQueryParams()).isEqualTo(expected.build()) } @Test @@ -40,8 +41,8 @@ class ProjectInferencePipelineListParamsTest { ProjectInferencePipelineListParams.builder() .projectId("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") .build() - val expected = mutableMapOf>() - assertThat(params.getQueryParams()).isEqualTo(expected) + val expected = QueryParams.builder() + assertThat(params.getQueryParams()).isEqualTo(expected.build()) } @Test diff --git a/openlayer-java-core/src/test/kotlin/com/openlayer/api/models/ProjectListParamsTest.kt b/openlayer-java-core/src/test/kotlin/com/openlayer/api/models/ProjectListParamsTest.kt index daf73e7..93c9049 100644 --- a/openlayer-java-core/src/test/kotlin/com/openlayer/api/models/ProjectListParamsTest.kt +++ b/openlayer-java-core/src/test/kotlin/com/openlayer/api/models/ProjectListParamsTest.kt @@ -2,6 +2,7 @@ package com.openlayer.api.models +import com.openlayer.api.core.http.QueryParams import com.openlayer.api.models.* import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test @@ -27,18 +28,18 @@ class ProjectListParamsTest { .perPage(100L) .taskType(ProjectListParams.TaskType.LLM_BASE) .build() - val expected = mutableMapOf>() - expected.put("name", listOf("name")) - expected.put("page", listOf("123")) - expected.put("perPage", listOf("100")) - expected.put("taskType", listOf(ProjectListParams.TaskType.LLM_BASE.toString())) - assertThat(params.getQueryParams()).isEqualTo(expected) + val expected = QueryParams.builder() + expected.put("name", "name") + expected.put("page", "123") + expected.put("perPage", "100") + expected.put("taskType", ProjectListParams.TaskType.LLM_BASE.toString()) + assertThat(params.getQueryParams()).isEqualTo(expected.build()) } @Test fun getQueryParamsWithoutOptionalFields() { val params = ProjectListParams.builder().build() - val expected = mutableMapOf>() - assertThat(params.getQueryParams()).isEqualTo(expected) + val expected = QueryParams.builder() + assertThat(params.getQueryParams()).isEqualTo(expected.build()) } } diff --git a/openlayer-java-core/src/test/kotlin/com/openlayer/api/models/StoragePresignedUrlCreateParamsTest.kt b/openlayer-java-core/src/test/kotlin/com/openlayer/api/models/StoragePresignedUrlCreateParamsTest.kt index 6ae03e8..baa5e92 100644 --- a/openlayer-java-core/src/test/kotlin/com/openlayer/api/models/StoragePresignedUrlCreateParamsTest.kt +++ b/openlayer-java-core/src/test/kotlin/com/openlayer/api/models/StoragePresignedUrlCreateParamsTest.kt @@ -2,6 +2,7 @@ package com.openlayer.api.models +import com.openlayer.api.core.http.QueryParams import com.openlayer.api.models.* import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test @@ -16,16 +17,16 @@ class StoragePresignedUrlCreateParamsTest { @Test fun getQueryParams() { val params = StoragePresignedUrlCreateParams.builder().objectName("objectName").build() - val expected = mutableMapOf>() - expected.put("objectName", listOf("objectName")) - assertThat(params.getQueryParams()).isEqualTo(expected) + val expected = QueryParams.builder() + expected.put("objectName", "objectName") + assertThat(params.getQueryParams()).isEqualTo(expected.build()) } @Test fun getQueryParamsWithoutOptionalFields() { val params = StoragePresignedUrlCreateParams.builder().objectName("objectName").build() - val expected = mutableMapOf>() - expected.put("objectName", listOf("objectName")) - assertThat(params.getQueryParams()).isEqualTo(expected) + val expected = QueryParams.builder() + expected.put("objectName", "objectName") + assertThat(params.getQueryParams()).isEqualTo(expected.build()) } } diff --git a/openlayer-java-core/src/test/kotlin/com/openlayer/api/services/ErrorHandlingTest.kt b/openlayer-java-core/src/test/kotlin/com/openlayer/api/services/ErrorHandlingTest.kt index 4dfd4b0..23aee00 100644 --- a/openlayer-java-core/src/test/kotlin/com/openlayer/api/services/ErrorHandlingTest.kt +++ b/openlayer-java-core/src/test/kotlin/com/openlayer/api/services/ErrorHandlingTest.kt @@ -7,16 +7,16 @@ import com.github.tomakehurst.wiremock.client.WireMock.anyUrl import com.github.tomakehurst.wiremock.client.WireMock.get import com.github.tomakehurst.wiremock.client.WireMock.ok import com.github.tomakehurst.wiremock.client.WireMock.post +import com.github.tomakehurst.wiremock.client.WireMock.put import com.github.tomakehurst.wiremock.client.WireMock.status import com.github.tomakehurst.wiremock.client.WireMock.stubFor import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo import com.github.tomakehurst.wiremock.junit5.WireMockTest -import com.google.common.collect.ImmutableListMultimap -import com.google.common.collect.ListMultimap import com.openlayer.api.client.OpenlayerClient import com.openlayer.api.client.okhttp.OpenlayerOkHttpClient import com.openlayer.api.core.JsonString import com.openlayer.api.core.JsonValue +import com.openlayer.api.core.http.Headers import com.openlayer.api.core.jsonMapper import com.openlayer.api.errors.BadRequestException import com.openlayer.api.errors.InternalServerException @@ -140,7 +140,7 @@ class ErrorHandlingTest { assertThatThrownBy({ client.inferencePipelines().data().stream(params) }) .satisfies({ e -> - assertBadRequest(e, ImmutableListMultimap.of("Foo", "Bar"), OPENLAYER_ERROR) + assertBadRequest(e, Headers.builder().put("Foo", "Bar").build(), OPENLAYER_ERROR) }) } @@ -185,7 +185,7 @@ class ErrorHandlingTest { assertThatThrownBy({ client.inferencePipelines().data().stream(params) }) .satisfies({ e -> - assertUnauthorized(e, ImmutableListMultimap.of("Foo", "Bar"), OPENLAYER_ERROR) + assertUnauthorized(e, Headers.builder().put("Foo", "Bar").build(), OPENLAYER_ERROR) }) } @@ -230,7 +230,11 @@ class ErrorHandlingTest { assertThatThrownBy({ client.inferencePipelines().data().stream(params) }) .satisfies({ e -> - assertPermissionDenied(e, ImmutableListMultimap.of("Foo", "Bar"), OPENLAYER_ERROR) + assertPermissionDenied( + e, + Headers.builder().put("Foo", "Bar").build(), + OPENLAYER_ERROR + ) }) } @@ -275,7 +279,7 @@ class ErrorHandlingTest { assertThatThrownBy({ client.inferencePipelines().data().stream(params) }) .satisfies({ e -> - assertNotFound(e, ImmutableListMultimap.of("Foo", "Bar"), OPENLAYER_ERROR) + assertNotFound(e, Headers.builder().put("Foo", "Bar").build(), OPENLAYER_ERROR) }) } @@ -322,7 +326,7 @@ class ErrorHandlingTest { .satisfies({ e -> assertUnprocessableEntity( e, - ImmutableListMultimap.of("Foo", "Bar"), + Headers.builder().put("Foo", "Bar").build(), OPENLAYER_ERROR ) }) @@ -369,7 +373,7 @@ class ErrorHandlingTest { assertThatThrownBy({ client.inferencePipelines().data().stream(params) }) .satisfies({ e -> - assertRateLimit(e, ImmutableListMultimap.of("Foo", "Bar"), OPENLAYER_ERROR) + assertRateLimit(e, Headers.builder().put("Foo", "Bar").build(), OPENLAYER_ERROR) }) } @@ -414,7 +418,11 @@ class ErrorHandlingTest { assertThatThrownBy({ client.inferencePipelines().data().stream(params) }) .satisfies({ e -> - assertInternalServer(e, ImmutableListMultimap.of("Foo", "Bar"), OPENLAYER_ERROR) + assertInternalServer( + e, + Headers.builder().put("Foo", "Bar").build(), + OPENLAYER_ERROR + ) }) } @@ -462,7 +470,7 @@ class ErrorHandlingTest { assertUnexpectedStatusCodeException( e, 999, - ImmutableListMultimap.of("Foo", "Bar"), + Headers.builder().put("Foo", "Bar").build(), toJson(OPENLAYER_ERROR) ) }) @@ -550,7 +558,7 @@ class ErrorHandlingTest { assertThatThrownBy({ client.inferencePipelines().data().stream(params) }) .satisfies({ e -> - assertBadRequest(e, ImmutableListMultimap.of(), OpenlayerError.builder().build()) + assertBadRequest(e, Headers.builder().build(), OpenlayerError.builder().build()) }) } @@ -561,7 +569,7 @@ class ErrorHandlingTest { private fun assertUnexpectedStatusCodeException( throwable: Throwable, statusCode: Int, - headers: ListMultimap, + headers: Headers, responseBody: ByteArray ) { assertThat(throwable) @@ -571,41 +579,33 @@ class ErrorHandlingTest { .satisfies({ e -> assertThat(e.statusCode()).isEqualTo(statusCode) assertThat(e.body()).isEqualTo(String(responseBody)) - assertThat(e.headers()).containsAllEntriesOf(headers) + assertThat(e.headers().toMap()).containsAllEntriesOf(headers.toMap()) }) } - private fun assertBadRequest( - throwable: Throwable, - headers: ListMultimap, - error: OpenlayerError - ) { + private fun assertBadRequest(throwable: Throwable, headers: Headers, error: OpenlayerError) { assertThat(throwable) .asInstanceOf(InstanceOfAssertFactories.throwable(BadRequestException::class.java)) .satisfies({ e -> assertThat(e.statusCode()).isEqualTo(400) assertThat(e.error()).isEqualTo(error) - assertThat(e.headers()).containsAllEntriesOf(headers) + assertThat(e.headers().toMap()).containsAllEntriesOf(headers.toMap()) }) } - private fun assertUnauthorized( - throwable: Throwable, - headers: ListMultimap, - error: OpenlayerError - ) { + private fun assertUnauthorized(throwable: Throwable, headers: Headers, error: OpenlayerError) { assertThat(throwable) .asInstanceOf(InstanceOfAssertFactories.throwable(UnauthorizedException::class.java)) .satisfies({ e -> assertThat(e.statusCode()).isEqualTo(401) assertThat(e.error()).isEqualTo(error) - assertThat(e.headers()).containsAllEntriesOf(headers) + assertThat(e.headers().toMap()).containsAllEntriesOf(headers.toMap()) }) } private fun assertPermissionDenied( throwable: Throwable, - headers: ListMultimap, + headers: Headers, error: OpenlayerError ) { assertThat(throwable) @@ -615,27 +615,23 @@ class ErrorHandlingTest { .satisfies({ e -> assertThat(e.statusCode()).isEqualTo(403) assertThat(e.error()).isEqualTo(error) - assertThat(e.headers()).containsAllEntriesOf(headers) + assertThat(e.headers().toMap()).containsAllEntriesOf(headers.toMap()) }) } - private fun assertNotFound( - throwable: Throwable, - headers: ListMultimap, - error: OpenlayerError - ) { + private fun assertNotFound(throwable: Throwable, headers: Headers, error: OpenlayerError) { assertThat(throwable) .asInstanceOf(InstanceOfAssertFactories.throwable(NotFoundException::class.java)) .satisfies({ e -> assertThat(e.statusCode()).isEqualTo(404) assertThat(e.error()).isEqualTo(error) - assertThat(e.headers()).containsAllEntriesOf(headers) + assertThat(e.headers().toMap()).containsAllEntriesOf(headers.toMap()) }) } private fun assertUnprocessableEntity( throwable: Throwable, - headers: ListMultimap, + headers: Headers, error: OpenlayerError ) { assertThat(throwable) @@ -645,27 +641,23 @@ class ErrorHandlingTest { .satisfies({ e -> assertThat(e.statusCode()).isEqualTo(422) assertThat(e.error()).isEqualTo(error) - assertThat(e.headers()).containsAllEntriesOf(headers) + assertThat(e.headers().toMap()).containsAllEntriesOf(headers.toMap()) }) } - private fun assertRateLimit( - throwable: Throwable, - headers: ListMultimap, - error: OpenlayerError - ) { + private fun assertRateLimit(throwable: Throwable, headers: Headers, error: OpenlayerError) { assertThat(throwable) .asInstanceOf(InstanceOfAssertFactories.throwable(RateLimitException::class.java)) .satisfies({ e -> assertThat(e.statusCode()).isEqualTo(429) assertThat(e.error()).isEqualTo(error) - assertThat(e.headers()).containsAllEntriesOf(headers) + assertThat(e.headers().toMap()).containsAllEntriesOf(headers.toMap()) }) } private fun assertInternalServer( throwable: Throwable, - headers: ListMultimap, + headers: Headers, error: OpenlayerError ) { assertThat(throwable) @@ -673,7 +665,12 @@ class ErrorHandlingTest { .satisfies({ e -> assertThat(e.statusCode()).isEqualTo(500) assertThat(e.error()).isEqualTo(error) - assertThat(e.headers()).containsAllEntriesOf(headers) + assertThat(e.headers().toMap()).containsAllEntriesOf(headers.toMap()) }) } + + private fun Headers.toMap(): Map> = + mutableMapOf>().also { map -> + names().forEach { map[it] = values(it) } + } } diff --git a/openlayer-java-core/src/test/kotlin/com/openlayer/api/services/blocking/CommitServiceTest.kt b/openlayer-java-core/src/test/kotlin/com/openlayer/api/services/blocking/CommitServiceTest.kt deleted file mode 100644 index 4a62862..0000000 --- a/openlayer-java-core/src/test/kotlin/com/openlayer/api/services/blocking/CommitServiceTest.kt +++ /dev/null @@ -1,9 +0,0 @@ -// File generated from our OpenAPI spec by Stainless. - -package com.openlayer.api.services.blocking - -import com.openlayer.api.TestServerExtension -import com.openlayer.api.models.* -import org.junit.jupiter.api.extension.ExtendWith - -@ExtendWith(TestServerExtension::class) class CommitServiceTest diff --git a/openlayer-java-core/src/test/kotlin/com/openlayer/api/services/blocking/StorageServiceTest.kt b/openlayer-java-core/src/test/kotlin/com/openlayer/api/services/blocking/StorageServiceTest.kt deleted file mode 100644 index 5c66b4e..0000000 --- a/openlayer-java-core/src/test/kotlin/com/openlayer/api/services/blocking/StorageServiceTest.kt +++ /dev/null @@ -1,9 +0,0 @@ -// File generated from our OpenAPI spec by Stainless. - -package com.openlayer.api.services.blocking - -import com.openlayer.api.TestServerExtension -import com.openlayer.api.models.* -import org.junit.jupiter.api.extension.ExtendWith - -@ExtendWith(TestServerExtension::class) class StorageServiceTest diff --git a/openlayer-java-core/src/test/kotlin/com/openlayer/api/services/blocking/projects/CommitServiceTest.kt b/openlayer-java-core/src/test/kotlin/com/openlayer/api/services/blocking/projects/CommitServiceTest.kt index 83a9c12..cbede51 100644 --- a/openlayer-java-core/src/test/kotlin/com/openlayer/api/services/blocking/projects/CommitServiceTest.kt +++ b/openlayer-java-core/src/test/kotlin/com/openlayer/api/services/blocking/projects/CommitServiceTest.kt @@ -5,12 +5,50 @@ package com.openlayer.api.services.blocking.projects import com.openlayer.api.TestServerExtension import com.openlayer.api.client.okhttp.OpenlayerOkHttpClient import com.openlayer.api.models.* +import java.time.OffsetDateTime import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith @ExtendWith(TestServerExtension::class) class CommitServiceTest { + @Test + fun callCreate() { + val client = + OpenlayerOkHttpClient.builder() + .baseUrl(TestServerExtension.BASE_URL) + .apiKey("My API Key") + .build() + val commitService = client.projects().commits() + val projectCommitCreateResponse = + commitService.create( + ProjectCommitCreateParams.builder() + .projectId("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .commit( + ProjectCommitCreateParams.Commit.builder() + .id("3fa85f64-5717-4562-b3fc-2c963f66afa6") + .authorId("589ece63-49a2-41b4-98e1-10547761d4b0") + .fileSize(123L) + .message("Updated the prompt.") + .mlModelId("3fa85f64-5717-4562-b3fc-2c963f66afa6") + .storageUri("s3://...") + .trainingDatasetId("3fa85f64-5717-4562-b3fc-2c963f66afa6") + .validationDatasetId("3fa85f64-5717-4562-b3fc-2c963f66afa6") + .dateCreated(OffsetDateTime.parse("2024-03-22T11:31:01.185Z")) + .gitCommitRef("main") + .gitCommitSha(123L) + .gitCommitUrl("gitCommitUrl") + .build() + ) + .storageUri("s3://...") + .archived(true) + .deploymentStatus("Deployed") + .build() + ) + println(projectCommitCreateResponse) + projectCommitCreateResponse.validate() + } + @Test fun callList() { val client =