Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(client): error class toBuilder not copying fields #373

Merged
merged 1 commit into from
Nov 7, 2024
Merged

fix(client): error class toBuilder not copying fields #373

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 15 additions & 9 deletions lithic-kotlin-core/src/main/kotlin/com/lithic/api/errors/LithicError.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,10 @@ import java.util.Objects
@JsonDeserialize(builder = LithicError.Builder::class)
@NoAutoDetect
class LithicError
constructor(
private val additionalProperties: Map<String, JsonValue>,
private constructor(
@JsonAnyGetter val additionalProperties: Map<String, JsonValue>,
) {

@JsonAnyGetter fun additionalProperties(): Map<String, JsonValue> = additionalProperties

fun toBuilder() = Builder()

override fun equals(other: Any?): Boolean {
if (this === other) {
return true
Expand All @@ -35,6 +31,8 @@ constructor(

override fun toString() = "LithicError{additionalProperties=$additionalProperties}"

fun toBuilder() = Builder().from(this)

companion object {

fun builder() = Builder()
Expand All @@ -44,22 +42,30 @@ constructor(

private var additionalProperties: MutableMap<String, JsonValue> = mutableMapOf()

fun from(error: LithicError) = apply { additionalProperties(error.additionalProperties) }
internal fun from(lithicError: LithicError) = apply {
additionalProperties = lithicError.additionalProperties.toMutableMap()
}

fun additionalProperties(additionalProperties: Map<String, JsonValue>) = 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<String, JsonValue>) = apply {
this.additionalProperties.putAll(additionalProperties)
}

fun removeAdditionalProperty(key: String) = apply { additionalProperties.remove(key) }

fun removeAllAdditionalProperties(keys: Set<String>) = apply {
keys.forEach(::removeAdditionalProperty)
}

fun build(): LithicError = LithicError(additionalProperties.toImmutable())
}
}