Skip to content

Commit 5b69caf

Browse files
chore: custom code changes (#44)
1 parent 97c92b4 commit 5b69caf

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+156
-2349
lines changed

openlayer-java-core/src/main/kotlin/com/openlayer/api/core/ClientOptions.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,8 @@ private constructor(
153153
clock,
154154
baseUrl,
155155
apiKey,
156-
headers.toUnmodifiable(),
157-
queryParams.toUnmodifiable(),
156+
headers.toImmutable(),
157+
queryParams.toImmutable(),
158158
responseValidation,
159159
maxRetries,
160160
)

openlayer-java-core/src/main/kotlin/com/openlayer/api/core/Utils.kt

+6-22
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ package com.openlayer.api.core
44

55
import com.google.common.collect.ImmutableListMultimap
66
import com.google.common.collect.ListMultimap
7-
import com.google.common.collect.Multimaps
87
import com.openlayer.api.errors.OpenlayerInvalidDataException
98
import java.util.Collections
109

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

1514
@JvmSynthetic
16-
internal fun <T> List<T>.toUnmodifiable(): List<T> {
17-
if (isEmpty()) {
18-
return Collections.emptyList()
19-
}
20-
21-
return Collections.unmodifiableList(this)
22-
}
15+
internal fun <T> List<T>.toImmutable(): List<T> =
16+
if (isEmpty()) Collections.emptyList() else Collections.unmodifiableList(toList())
2317

2418
@JvmSynthetic
25-
internal fun <K, V> Map<K, V>.toUnmodifiable(): Map<K, V> {
26-
if (isEmpty()) {
27-
return Collections.emptyMap()
28-
}
29-
30-
return Collections.unmodifiableMap(this)
31-
}
19+
internal fun <K, V> Map<K, V>.toImmutable(): Map<K, V> =
20+
if (isEmpty()) Collections.emptyMap() else Collections.unmodifiableMap(toMap())
3221

3322
@JvmSynthetic
34-
internal fun <K, V> ListMultimap<K, V>.toUnmodifiable(): ListMultimap<K, V> {
35-
if (isEmpty()) {
36-
return ImmutableListMultimap.of()
37-
}
38-
39-
return Multimaps.unmodifiableListMultimap(this)
40-
}
23+
internal fun <K, V> ListMultimap<K, V>.toImmutable(): ListMultimap<K, V> =
24+
ImmutableListMultimap.copyOf(this)
4125

4226
internal interface Enum

openlayer-java-core/src/main/kotlin/com/openlayer/api/core/Values.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ private constructor(
389389
override fun toString() = values.toString()
390390

391391
companion object {
392-
@JsonCreator @JvmStatic fun of(values: List<JsonValue>) = JsonArray(values.toUnmodifiable())
392+
@JsonCreator @JvmStatic fun of(values: List<JsonValue>) = JsonArray(values.toImmutable())
393393
}
394394
}
395395

@@ -415,7 +415,7 @@ private constructor(
415415
companion object {
416416
@JsonCreator
417417
@JvmStatic
418-
fun of(values: Map<String, JsonValue>) = JsonObject(values.toUnmodifiable())
418+
fun of(values: Map<String, JsonValue>) = JsonObject(values.toImmutable())
419419
}
420420
}
421421

openlayer-java-core/src/main/kotlin/com/openlayer/api/core/http/BinaryResponseContent.kt

-16
This file was deleted.

openlayer-java-core/src/main/kotlin/com/openlayer/api/core/http/HttpRequest.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import com.google.common.collect.ArrayListMultimap
44
import com.google.common.collect.ListMultimap
55
import com.google.common.collect.Multimap
66
import com.google.common.collect.MultimapBuilder
7-
import com.openlayer.api.core.toUnmodifiable
7+
import com.openlayer.api.core.toImmutable
88

99
class HttpRequest
1010
private constructor(
@@ -83,8 +83,8 @@ private constructor(
8383
HttpRequest(
8484
checkNotNull(method) { "`method` is required but was not set" },
8585
url,
86-
pathSegments.toUnmodifiable(),
87-
queryParams.toUnmodifiable(),
86+
pathSegments.toImmutable(),
87+
queryParams.toImmutable(),
8888
headers,
8989
body,
9090
)

openlayer-java-core/src/main/kotlin/com/openlayer/api/errors/OpenlayerError.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import com.fasterxml.jackson.annotation.JsonAnySetter
77
import com.fasterxml.jackson.databind.annotation.JsonDeserialize
88
import com.openlayer.api.core.JsonValue
99
import com.openlayer.api.core.NoAutoDetect
10-
import com.openlayer.api.core.toUnmodifiable
10+
import com.openlayer.api.core.toImmutable
1111
import java.util.Objects
1212

1313
@JsonDeserialize(builder = OpenlayerError.Builder::class)
@@ -60,6 +60,6 @@ constructor(
6060
this.additionalProperties.putAll(additionalProperties)
6161
}
6262

63-
fun build(): OpenlayerError = OpenlayerError(additionalProperties.toUnmodifiable())
63+
fun build(): OpenlayerError = OpenlayerError(additionalProperties.toImmutable())
6464
}
6565
}

0 commit comments

Comments
 (0)