From 0f825729342ad5977e941971779f1526008ae050 Mon Sep 17 00:00:00 2001 From: Logan Simonsen Date: Mon, 1 Dec 2025 15:33:42 -0700 Subject: [PATCH 1/4] Expose api_keys on BaseUser model --- src/main/java/com/easypost/model/BaseUser.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/com/easypost/model/BaseUser.java b/src/main/java/com/easypost/model/BaseUser.java index b11aacafc..2ad5f821e 100644 --- a/src/main/java/com/easypost/model/BaseUser.java +++ b/src/main/java/com/easypost/model/BaseUser.java @@ -1,6 +1,7 @@ package com.easypost.model; import java.util.List; +import com.google.gson.annotations.SerializedName; import lombok.Getter; @Getter @@ -21,4 +22,7 @@ public class BaseUser extends EasyPostResource { private String insuranceFeeRate; private String insuranceFeeMinimum; private List children; + + @SerializedName("api_keys") + private List apiKeys; } From 2c99aa0651df15cce9926b084c6cc621a462e479 Mon Sep 17 00:00:00 2001 From: Josh Lane Date: Mon, 1 Dec 2025 15:26:36 -0800 Subject: [PATCH 2/4] fix: remove duplicate apiKeys field from ReferralCustomer ReferralCustomer extends BaseUser, which now has the apiKeys field. Having apiKeys in both classes causes a Gson duplicate field error during JSON deserialization. --- src/main/java/com/easypost/model/ReferralCustomer.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/com/easypost/model/ReferralCustomer.java b/src/main/java/com/easypost/model/ReferralCustomer.java index 0bb13c1bf..17ff2fbf5 100644 --- a/src/main/java/com/easypost/model/ReferralCustomer.java +++ b/src/main/java/com/easypost/model/ReferralCustomer.java @@ -1,10 +1,8 @@ package com.easypost.model; -import java.util.List; - import lombok.Getter; @Getter public class ReferralCustomer extends BaseUser { - private List apiKeys; + // apiKeys is inherited from BaseUser } From 9d089a8f22a7246a97d3707364fec95f39505ff6 Mon Sep 17 00:00:00 2001 From: Justin Hammond <39606064+Justintime50@users.noreply.github.com> Date: Mon, 1 Dec 2025 16:40:32 -0700 Subject: [PATCH 3/4] Clean up BaseUser class by removing unused code Removed unused import and SerializedName annotation. --- src/main/java/com/easypost/model/BaseUser.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/java/com/easypost/model/BaseUser.java b/src/main/java/com/easypost/model/BaseUser.java index 2ad5f821e..4ccffa8d9 100644 --- a/src/main/java/com/easypost/model/BaseUser.java +++ b/src/main/java/com/easypost/model/BaseUser.java @@ -1,7 +1,6 @@ package com.easypost.model; import java.util.List; -import com.google.gson.annotations.SerializedName; import lombok.Getter; @Getter @@ -22,7 +21,5 @@ public class BaseUser extends EasyPostResource { private String insuranceFeeRate; private String insuranceFeeMinimum; private List children; - - @SerializedName("api_keys") private List apiKeys; } From cf713201003f1d2a80d37e4c6c988052c14cefbf Mon Sep 17 00:00:00 2001 From: Justin Hammond <39606064+Justintime50@users.noreply.github.com> Date: Mon, 1 Dec 2025 16:40:52 -0700 Subject: [PATCH 4/4] Remove unnecessary comment in ReferralCustomer class --- src/main/java/com/easypost/model/ReferralCustomer.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/easypost/model/ReferralCustomer.java b/src/main/java/com/easypost/model/ReferralCustomer.java index 17ff2fbf5..b80518585 100644 --- a/src/main/java/com/easypost/model/ReferralCustomer.java +++ b/src/main/java/com/easypost/model/ReferralCustomer.java @@ -4,5 +4,4 @@ @Getter public class ReferralCustomer extends BaseUser { - // apiKeys is inherited from BaseUser }