Skip to content

Commit 9651968

Browse files
fix: merge conflicts (#371)
Co-authored-by: Tomer Aberbach <tomer@stainlessapi.com>
1 parent a0ea690 commit 9651968

3 files changed

Lines changed: 24 additions & 10 deletions

File tree

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,18 @@ internal fun <K : Comparable<K>, V> SortedMap<K, V>.toImmutable(): SortedMap<K,
2929
internal fun <K, V> ListMultimap<K, V>.toImmutable(): ListMultimap<K, V> =
3030
ImmutableListMultimap.copyOf(this)
3131

32+
@JvmSynthetic
33+
internal fun ListMultimap<String, String>.getRequiredHeader(header: String): String {
34+
val value =
35+
entries()
36+
.stream()
37+
.filter { entry -> entry.key.equals(header, ignoreCase = true) }
38+
.map { entry -> entry.value }
39+
.findFirst()
40+
if (!value.isPresent) {
41+
throw LithicInvalidDataException("Could not find $header header")
42+
}
43+
return value.get()
44+
}
45+
3246
internal interface Enum

lithic-java-core/src/main/kotlin/com/lithic/api/models/CardGetEmbedHtmlParams.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize
99
import com.lithic.api.core.ExcludeMissing
1010
import com.lithic.api.core.JsonValue
1111
import com.lithic.api.core.NoAutoDetect
12-
import com.lithic.api.core.toUnmodifiable
12+
import com.lithic.api.core.toImmutable
1313
import com.lithic.api.models.*
1414
import java.time.OffsetDateTime
1515
import java.util.Objects
@@ -202,7 +202,7 @@ constructor(
202202
css,
203203
expiration,
204204
targetOrigin,
205-
additionalProperties.toUnmodifiable(),
205+
additionalProperties.toImmutable(),
206206
)
207207
}
208208
}
@@ -362,9 +362,9 @@ constructor(
362362
css,
363363
expiration,
364364
targetOrigin,
365-
additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(),
366-
additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(),
367-
additionalBodyProperties.toUnmodifiable(),
365+
additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(),
366+
additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(),
367+
additionalBodyProperties.toImmutable(),
368368
)
369369
}
370370
}

lithic-java-core/src/main/kotlin/com/lithic/api/models/CardGetEmbedUrlParams.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize
99
import com.lithic.api.core.ExcludeMissing
1010
import com.lithic.api.core.JsonValue
1111
import com.lithic.api.core.NoAutoDetect
12-
import com.lithic.api.core.toUnmodifiable
12+
import com.lithic.api.core.toImmutable
1313
import com.lithic.api.models.*
1414
import java.time.OffsetDateTime
1515
import java.util.Objects
@@ -202,7 +202,7 @@ constructor(
202202
css,
203203
expiration,
204204
targetOrigin,
205-
additionalProperties.toUnmodifiable(),
205+
additionalProperties.toImmutable(),
206206
)
207207
}
208208
}
@@ -362,9 +362,9 @@ constructor(
362362
css,
363363
expiration,
364364
targetOrigin,
365-
additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(),
366-
additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(),
367-
additionalBodyProperties.toUnmodifiable(),
365+
additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(),
366+
additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(),
367+
additionalBodyProperties.toImmutable(),
368368
)
369369
}
370370
}

0 commit comments

Comments
 (0)