Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,8 @@ private constructor(
clock,
baseUrl,
apiKey,
headers.toUnmodifiable(),
queryParams.toUnmodifiable(),
headers.toImmutable(),
queryParams.toImmutable(),
responseValidation,
maxRetries,
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ 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

Expand All @@ -13,30 +12,15 @@ internal fun <T : Any> T?.getOrThrow(name: String): T =
this ?: throw OpenlayerInvalidDataException("`${name}` is not present")

@JvmSynthetic
internal fun <T> List<T>.toUnmodifiable(): List<T> {
if (isEmpty()) {
return Collections.emptyList()
}

return Collections.unmodifiableList(this)
}
internal fun <T> List<T>.toImmutable(): List<T> =
if (isEmpty()) Collections.emptyList() else Collections.unmodifiableList(toList())

@JvmSynthetic
internal fun <K, V> Map<K, V>.toUnmodifiable(): Map<K, V> {
if (isEmpty()) {
return Collections.emptyMap()
}

return Collections.unmodifiableMap(this)
}
internal fun <K, V> Map<K, V>.toImmutable(): Map<K, V> =
if (isEmpty()) Collections.emptyMap() else Collections.unmodifiableMap(toMap())

@JvmSynthetic
internal fun <K, V> ListMultimap<K, V>.toUnmodifiable(): ListMultimap<K, V> {
if (isEmpty()) {
return ImmutableListMultimap.of()
}

return Multimaps.unmodifiableListMultimap(this)
}
internal fun <K, V> ListMultimap<K, V>.toImmutable(): ListMultimap<K, V> =
ImmutableListMultimap.copyOf(this)

internal interface Enum
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ private constructor(
override fun toString() = values.toString()

companion object {
@JsonCreator @JvmStatic fun of(values: List<JsonValue>) = JsonArray(values.toUnmodifiable())
@JsonCreator @JvmStatic fun of(values: List<JsonValue>) = JsonArray(values.toImmutable())
}
}

Expand All @@ -415,7 +415,7 @@ private constructor(
companion object {
@JsonCreator
@JvmStatic
fun of(values: Map<String, JsonValue>) = JsonObject(values.toUnmodifiable())
fun of(values: Map<String, JsonValue>) = JsonObject(values.toImmutable())
}
}

Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ 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(
Expand Down Expand Up @@ -83,8 +83,8 @@ private constructor(
HttpRequest(
checkNotNull(method) { "`method` is required but was not set" },
url,
pathSegments.toUnmodifiable(),
queryParams.toUnmodifiable(),
pathSegments.toImmutable(),
queryParams.toImmutable(),
headers,
body,
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ 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)
Expand Down Expand Up @@ -60,6 +60,6 @@ constructor(
this.additionalProperties.putAll(additionalProperties)
}

fun build(): OpenlayerError = OpenlayerError(additionalProperties.toUnmodifiable())
fun build(): OpenlayerError = OpenlayerError(additionalProperties.toImmutable())
}
}
Loading