diff --git a/android-client-sdk/src/main/java/com/devcycle/sdk/android/model/BucketedUserConfig.kt b/android-client-sdk/src/main/java/com/devcycle/sdk/android/model/BucketedUserConfig.kt index 35fd57ca..26313c8d 100644 --- a/android-client-sdk/src/main/java/com/devcycle/sdk/android/model/BucketedUserConfig.kt +++ b/android-client-sdk/src/main/java/com/devcycle/sdk/android/model/BucketedUserConfig.kt @@ -1,11 +1,8 @@ package com.devcycle.sdk.android.model -import com.fasterxml.jackson.annotation.JsonIgnoreProperties import io.swagger.v3.oas.annotations.media.Schema import java.math.BigDecimal -@JsonIgnoreProperties(ignoreUnknown = true) - /** * ClientSDKAPIResponse */ diff --git a/android-client-sdk/src/main/java/com/devcycle/sdk/android/model/ConfigVariable.kt b/android-client-sdk/src/main/java/com/devcycle/sdk/android/model/ConfigVariable.kt index ece22a4f..26a92f2c 100644 --- a/android-client-sdk/src/main/java/com/devcycle/sdk/android/model/ConfigVariable.kt +++ b/android-client-sdk/src/main/java/com/devcycle/sdk/android/model/ConfigVariable.kt @@ -1,6 +1,5 @@ package com.devcycle.sdk.android.model -import com.fasterxml.jackson.annotation.JsonIgnoreProperties import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.core.JsonParseException import com.fasterxml.jackson.core.JsonParser @@ -36,7 +35,6 @@ class VariableDeserializer : JsonDeserializer() { } @JsonDeserialize(using = VariableDeserializer::class) -@JsonIgnoreProperties(ignoreUnknown = true) abstract class BaseConfigVariable { abstract val id: String abstract val value: Any @@ -46,7 +44,6 @@ abstract class BaseConfigVariable { } @JsonDeserialize(`as` = StringConfigVariable::class) -@JsonIgnoreProperties(ignoreUnknown = true) class StringConfigVariable( @JsonProperty("_id") override val id: String, @@ -57,7 +54,6 @@ class StringConfigVariable( ) : BaseConfigVariable() @JsonDeserialize(`as` = BooleanConfigVariable::class) -@JsonIgnoreProperties(ignoreUnknown = true) class BooleanConfigVariable( @JsonProperty("_id") override val id: String, @@ -68,7 +64,6 @@ class BooleanConfigVariable( ) : BaseConfigVariable() @JsonDeserialize(`as` = NumberConfigVariable::class) -@JsonIgnoreProperties(ignoreUnknown = true) class NumberConfigVariable( @JsonProperty("_id") override val id: String, @@ -79,7 +74,6 @@ class NumberConfigVariable( ) : BaseConfigVariable() @JsonDeserialize(`as` = JSONObjectConfigVariable::class) -@JsonIgnoreProperties(ignoreUnknown = true) class JSONObjectConfigVariable( @JsonProperty("_id") override val id: String, @@ -90,7 +84,6 @@ class JSONObjectConfigVariable( ) : BaseConfigVariable() @JsonDeserialize(`as` = JSONArrayConfigVariable::class) -@JsonIgnoreProperties(ignoreUnknown = true) class JSONArrayConfigVariable( @JsonProperty("_id") override val id: String, diff --git a/android-client-sdk/src/main/java/com/devcycle/sdk/android/model/DevCycleUser.kt b/android-client-sdk/src/main/java/com/devcycle/sdk/android/model/DevCycleUser.kt index 45cba993..c681f31f 100755 --- a/android-client-sdk/src/main/java/com/devcycle/sdk/android/model/DevCycleUser.kt +++ b/android-client-sdk/src/main/java/com/devcycle/sdk/android/model/DevCycleUser.kt @@ -1,9 +1,8 @@ package com.devcycle.sdk.android.model -import com.fasterxml.jackson.annotation.JsonIgnoreProperties import com.fasterxml.jackson.annotation.JsonProperty -class DevCycleUser private constructor( +data class DevCycleUser private constructor( private var _userId: String?, private var _isAnonymous: Boolean?, var email: String? = null, @@ -28,8 +27,6 @@ class DevCycleUser private constructor( } class Builder internal constructor() { - @JsonIgnoreProperties(ignoreUnknown = true) - private var userId: String? = null private var isAnonymous: Boolean? = null private var email: String? = null diff --git a/android-client-sdk/src/main/java/com/devcycle/sdk/android/model/EdgeDB.kt b/android-client-sdk/src/main/java/com/devcycle/sdk/android/model/EdgeDB.kt index 5b234e9e..368c208a 100644 --- a/android-client-sdk/src/main/java/com/devcycle/sdk/android/model/EdgeDB.kt +++ b/android-client-sdk/src/main/java/com/devcycle/sdk/android/model/EdgeDB.kt @@ -1,11 +1,8 @@ package com.devcycle.sdk.android.model -import com.fasterxml.jackson.annotation.JsonIgnoreProperties import com.fasterxml.jackson.annotation.JsonProperty import io.swagger.v3.oas.annotations.media.Schema -@JsonIgnoreProperties(ignoreUnknown = true) - class EdgeDB { /** * Enabled flag, that is set by the Bucketed User Config -> Project Settings -> EdgeDB diff --git a/android-client-sdk/src/main/java/com/devcycle/sdk/android/model/Environment.kt b/android-client-sdk/src/main/java/com/devcycle/sdk/android/model/Environment.kt index 2eb546e1..5f24ec93 100644 --- a/android-client-sdk/src/main/java/com/devcycle/sdk/android/model/Environment.kt +++ b/android-client-sdk/src/main/java/com/devcycle/sdk/android/model/Environment.kt @@ -1,11 +1,8 @@ package com.devcycle.sdk.android.model -import com.fasterxml.jackson.annotation.JsonIgnoreProperties import com.fasterxml.jackson.annotation.JsonProperty import io.swagger.v3.oas.annotations.media.Schema -@JsonIgnoreProperties(ignoreUnknown = true) - /** * Environment */ @@ -27,6 +24,7 @@ class Environment { description = "Unique key by Project, can be used in the SDK / API to reference by 'key' rather than _id." ) var key: String? = null + fun id(id: String?): Environment { this.id = id return this diff --git a/android-client-sdk/src/main/java/com/devcycle/sdk/android/model/ErrorResponse.kt b/android-client-sdk/src/main/java/com/devcycle/sdk/android/model/ErrorResponse.kt index 88fa86f3..31347bea 100644 --- a/android-client-sdk/src/main/java/com/devcycle/sdk/android/model/ErrorResponse.kt +++ b/android-client-sdk/src/main/java/com/devcycle/sdk/android/model/ErrorResponse.kt @@ -2,9 +2,7 @@ package com.devcycle.sdk.android.model import io.swagger.v3.oas.annotations.media.Schema import com.fasterxml.jackson.annotation.JsonFormat -import com.fasterxml.jackson.annotation.JsonIgnoreProperties -@JsonIgnoreProperties(ignoreUnknown = true) data class ErrorResponse ( @Schema(required = true, description = "Error message") @JsonFormat(with = [JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY]) diff --git a/android-client-sdk/src/main/java/com/devcycle/sdk/android/model/Feature.kt b/android-client-sdk/src/main/java/com/devcycle/sdk/android/model/Feature.kt index f327e571..c49c357c 100644 --- a/android-client-sdk/src/main/java/com/devcycle/sdk/android/model/Feature.kt +++ b/android-client-sdk/src/main/java/com/devcycle/sdk/android/model/Feature.kt @@ -1,12 +1,9 @@ package com.devcycle.sdk.android.model -import com.fasterxml.jackson.annotation.JsonIgnoreProperties import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonValue import io.swagger.v3.oas.annotations.media.Schema -@JsonIgnoreProperties(ignoreUnknown = true) - /** * Feature */ diff --git a/android-client-sdk/src/main/java/com/devcycle/sdk/android/model/Project.kt b/android-client-sdk/src/main/java/com/devcycle/sdk/android/model/Project.kt index 49aa2397..0391f2ca 100644 --- a/android-client-sdk/src/main/java/com/devcycle/sdk/android/model/Project.kt +++ b/android-client-sdk/src/main/java/com/devcycle/sdk/android/model/Project.kt @@ -1,11 +1,8 @@ package com.devcycle.sdk.android.model -import com.fasterxml.jackson.annotation.JsonIgnoreProperties import com.fasterxml.jackson.annotation.JsonProperty import io.swagger.v3.oas.annotations.media.Schema -@JsonIgnoreProperties(ignoreUnknown = true) - /** * Project */ diff --git a/android-client-sdk/src/main/java/com/devcycle/sdk/android/model/ProjectSettings.kt b/android-client-sdk/src/main/java/com/devcycle/sdk/android/model/ProjectSettings.kt index 04f23e19..aa832b91 100644 --- a/android-client-sdk/src/main/java/com/devcycle/sdk/android/model/ProjectSettings.kt +++ b/android-client-sdk/src/main/java/com/devcycle/sdk/android/model/ProjectSettings.kt @@ -1,11 +1,8 @@ package com.devcycle.sdk.android.model -import com.fasterxml.jackson.annotation.JsonIgnoreProperties import com.fasterxml.jackson.annotation.JsonProperty import io.swagger.v3.oas.annotations.media.Schema -@JsonIgnoreProperties(ignoreUnknown = true) - class ProjectSettings { /** * edgeDB Project Settings diff --git a/android-client-sdk/src/main/java/com/devcycle/sdk/android/model/SSE.kt b/android-client-sdk/src/main/java/com/devcycle/sdk/android/model/SSE.kt index 9a759d62..8be34ad5 100644 --- a/android-client-sdk/src/main/java/com/devcycle/sdk/android/model/SSE.kt +++ b/android-client-sdk/src/main/java/com/devcycle/sdk/android/model/SSE.kt @@ -1,11 +1,8 @@ package com.devcycle.sdk.android.model -import com.fasterxml.jackson.annotation.JsonIgnoreProperties import com.fasterxml.jackson.annotation.JsonProperty import io.swagger.v3.oas.annotations.media.Schema -@JsonIgnoreProperties(ignoreUnknown = true) - class SSE { /** * SSE connection URL, that is set by the Bucketed User Config -> SSE -> URL diff --git a/android-client-sdk/src/main/java/com/devcycle/sdk/android/model/Variable.kt b/android-client-sdk/src/main/java/com/devcycle/sdk/android/model/Variable.kt index bf1284a4..05eeacc8 100644 --- a/android-client-sdk/src/main/java/com/devcycle/sdk/android/model/Variable.kt +++ b/android-client-sdk/src/main/java/com/devcycle/sdk/android/model/Variable.kt @@ -16,7 +16,6 @@ import com.devcycle.sdk.android.listener.BucketedUserConfigListener import com.devcycle.sdk.android.exception.DVCVariableException import com.devcycle.sdk.android.util.JSONMapper import com.fasterxml.jackson.annotation.JsonIgnore -import com.fasterxml.jackson.annotation.JsonIgnoreProperties import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonValue import kotlinx.coroutines.* @@ -29,8 +28,6 @@ import java.beans.PropertyChangeEvent import java.beans.PropertyChangeListener import java.lang.IllegalArgumentException -@JsonIgnoreProperties(ignoreUnknown = true) - /** * Variable */ @@ -42,7 +39,7 @@ class Variable internal constructor( @JsonProperty("_id") var id: String? = null, /** - * Unique key by Project, can be used in the SDK / API to reference by 'key' rather than _id. + * Unique key by Project, can be used in the SDK / API to reference by 'key' rather than _id. * @return key */ val key: String,