Skip to content

Commit 9240ce7

Browse files
committed
fix: update EvalReason class to only parse non_null attributes
1 parent 324a694 commit 9240ce7

File tree

3 files changed

+25
-9
lines changed

3 files changed

+25
-9
lines changed

src/main/java/com/devcycle/sdk/server/common/api/IDevCycleApi.java

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,24 @@
11
package com.devcycle.sdk.server.common.api;
22

3-
import com.devcycle.sdk.server.common.model.*;
3+
import java.util.Map;
4+
5+
import com.devcycle.sdk.server.common.model.BaseVariable;
6+
import com.devcycle.sdk.server.common.model.DevCycleResponse;
7+
import com.devcycle.sdk.server.common.model.DevCycleUser;
8+
import com.devcycle.sdk.server.common.model.DevCycleUserAndEvents;
9+
import com.devcycle.sdk.server.common.model.Feature;
10+
import com.devcycle.sdk.server.common.model.ProjectConfig;
11+
import com.devcycle.sdk.server.common.model.Variable;
412
import com.devcycle.sdk.server.local.model.EventsBatch;
5-
import retrofit2.Call;
6-
import retrofit2.http.*;
713

8-
import java.util.Map;
14+
import retrofit2.Call;
15+
import retrofit2.http.Body;
16+
import retrofit2.http.GET;
17+
import retrofit2.http.Header;
18+
import retrofit2.http.Headers;
19+
import retrofit2.http.POST;
20+
import retrofit2.http.Path;
21+
import retrofit2.http.Query;
922

1023
public interface IDevCycleApi {
1124
/**

src/main/java/com/devcycle/sdk/server/common/model/EvalReason.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
@AllArgsConstructor
1414
@RequiredArgsConstructor
1515
@JsonIgnoreProperties(ignoreUnknown = true)
16+
@JsonInclude(JsonInclude.Include.NON_NULL)
1617
public class EvalReason {
1718
@Schema(description = "Evaluation reason", required = true)
1819
@JsonProperty("reason")
@@ -24,7 +25,6 @@ public class EvalReason {
2425

2526
@Schema(description = "Target ID")
2627
@JsonProperty("target_id")
27-
@JsonInclude(value=JsonInclude.Include.NON_EMPTY, content=JsonInclude.Include.NON_NULL)
2828
private String targetId;
2929

3030
private EvalReason(String reason, String details) {

src/main/java/com/devcycle/sdk/server/common/model/Variable.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
import java.util.HashMap;
44
import java.util.LinkedHashMap;
55

6+
import com.fasterxml.jackson.annotation.JsonIgnore;
67
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
8+
import com.fasterxml.jackson.annotation.JsonProperty;
79
import com.fasterxml.jackson.annotation.JsonValue;
810

911
import io.swagger.v3.oas.annotations.media.Schema;
@@ -33,13 +35,14 @@ public class Variable<T> {
3335
@Builder.Default
3436
private Boolean isDefaulted = false;
3537

36-
@Builder.Default
37-
@Deprecated()
38-
private String evalReason = null;
39-
4038
@Schema(description = "Evaluation reason")
39+
@JsonProperty("eval")
4140
private EvalReason eval;
4241

42+
@Deprecated()
43+
@JsonIgnore
44+
private final String evalReason = null;
45+
4346
public enum TypeEnum {
4447
STRING("String"),
4548
BOOLEAN("Boolean"),

0 commit comments

Comments
 (0)