Skip to content

chore: cleanup unnecessary JSON properties and annotations #242

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

Merged
merged 3 commits into from
Jun 20, 2025
Merged

chore: cleanup unnecessary JSON properties and annotations #242

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a5488b9
Remove JsonIgnoreProperties and convert model classes to data classes
cursoragent Jun 19, 2025
f48802a
Convert data classes to regular classes in model package
cursoragent Jun 20, 2025
6d74875
Remove unused import for java.util.Date in ErrorResponse
cursoragent Jun 20, 2025
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
3 changes: 0 additions & 3 deletions android-client-sdk/src/main/java/com/devcycle/sdk/android/model/BucketedUserConfig.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
*/
Expand Down
7 changes: 0 additions & 7 deletions android-client-sdk/src/main/java/com/devcycle/sdk/android/model/ConfigVariable.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -36,7 +35,6 @@ class VariableDeserializer : JsonDeserializer<BaseConfigVariable>() {
}

@JsonDeserialize(using = VariableDeserializer::class)
@JsonIgnoreProperties(ignoreUnknown = true)
abstract class BaseConfigVariable {
abstract val id: String
abstract val value: Any
Expand All @@ -46,7 +44,6 @@ abstract class BaseConfigVariable {
}

@JsonDeserialize(`as` = StringConfigVariable::class)
@JsonIgnoreProperties(ignoreUnknown = true)
class StringConfigVariable(
@JsonProperty("_id")
override val id: String,
Expand All @@ -57,7 +54,6 @@ class StringConfigVariable(
) : BaseConfigVariable()

@JsonDeserialize(`as` = BooleanConfigVariable::class)
@JsonIgnoreProperties(ignoreUnknown = true)
class BooleanConfigVariable(
@JsonProperty("_id")
override val id: String,
Expand All @@ -68,7 +64,6 @@ class BooleanConfigVariable(
) : BaseConfigVariable()

@JsonDeserialize(`as` = NumberConfigVariable::class)
@JsonIgnoreProperties(ignoreUnknown = true)
class NumberConfigVariable(
@JsonProperty("_id")
override val id: String,
Expand All @@ -79,7 +74,6 @@ class NumberConfigVariable(
) : BaseConfigVariable()

@JsonDeserialize(`as` = JSONObjectConfigVariable::class)
@JsonIgnoreProperties(ignoreUnknown = true)
class JSONObjectConfigVariable(
@JsonProperty("_id")
override val id: String,
Expand All @@ -90,7 +84,6 @@ class JSONObjectConfigVariable(
) : BaseConfigVariable()

@JsonDeserialize(`as` = JSONArrayConfigVariable::class)
@JsonIgnoreProperties(ignoreUnknown = true)
class JSONArrayConfigVariable(
@JsonProperty("_id")
override val id: String,
Expand Down
5 changes: 1 addition & 4 deletions android-client-sdk/src/main/java/com/devcycle/sdk/android/model/DevCycleUser.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -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
Expand Down
5 changes: 1 addition & 4 deletions android-client-sdk/src/main/java/com/devcycle/sdk/android/model/EdgeDB.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
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 {
data class EdgeDB {
/**
* Enabled flag, that is set by the Bucketed User Config -> Project Settings -> EdgeDB
* @return _id
Expand Down
6 changes: 2 additions & 4 deletions android-client-sdk/src/main/java/com/devcycle/sdk/android/model/Environment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
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
*/
class Environment {
data class Environment {
/**
* unique database id
* @return _id
Expand All @@ -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
Expand Down
3 changes: 1 addition & 2 deletions android-client-sdk/src/main/java/com/devcycle/sdk/android/model/ErrorResponse.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@ 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
import java.util.*

@JsonIgnoreProperties(ignoreUnknown = true)
data class ErrorResponse (
@Schema(required = true, description = "Error message")
@JsonFormat(with = [JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY])
Expand Down
5 changes: 1 addition & 4 deletions android-client-sdk/src/main/java/com/devcycle/sdk/android/model/Feature.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
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
*/
class Feature {
data class Feature {
Copy link
Member Author

@jonathannorris jonathannorris Jun 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is interesting that this was missing...

Copy link
Member Author

@jonathannorris jonathannorris Jun 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image

Copy link
Member Author

@jonathannorris jonathannorris Jun 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess do we want these to be data classes?

Copy link
Contributor

@kaushalkapasi kaushalkapasi Jun 19, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah, I just made the same update in my PR #240. though it does need some refactoring to make sure everything compiles, the test data is updated and all test pass appropriately

/**
* unique database id
* @return _id
Expand Down
5 changes: 1 addition & 4 deletions android-client-sdk/src/main/java/com/devcycle/sdk/android/model/Project.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
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
*/
class Project {
data class Project {
/**
* unique database id
* @return _id
Expand Down
5 changes: 1 addition & 4 deletions android-client-sdk/src/main/java/com/devcycle/sdk/android/model/ProjectSettings.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
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 {
data class ProjectSettings {
/**
* edgeDB Project Settings
* @return edgeDB
Expand Down
5 changes: 1 addition & 4 deletions android-client-sdk/src/main/java/com/devcycle/sdk/android/model/SSE.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
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 {
data class SSE {
/**
* SSE connection URL, that is set by the Bucketed User Config -> SSE -> URL
*/
Expand Down
5 changes: 1 addition & 4 deletions android-client-sdk/src/main/java/com/devcycle/sdk/android/model/Variable.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*
Expand All @@ -29,8 +28,6 @@ import java.beans.PropertyChangeEvent
import java.beans.PropertyChangeListener
import java.lang.IllegalArgumentException

@JsonIgnoreProperties(ignoreUnknown = true)

/**
* Variable
*/
Expand All @@ -42,7 +39,7 @@ class Variable<T> internal constructor(
@JsonProperty("_id")
var id: String? = null,
/**
* Unique key by Project, can be used in the SDK / API to reference by &#x27;key&#x27; 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,
Expand Down
Loading