From fa5741b73cbd09b0bb66b337a2e323153040e82e Mon Sep 17 00:00:00 2001 From: Justintime50 <39606064+Justintime50@users.noreply.github.com> Date: Wed, 7 Aug 2024 09:46:20 -0600 Subject: [PATCH 1/3] feat: adds surcharges property and model to Rate object --- CHANGELOG.md | 1 + src/main/java/com/easypost/model/Rate.java | 3 +++ src/main/java/com/easypost/model/Surcharge.java | 13 +++++++++++++ 3 files changed, 17 insertions(+) create mode 100644 src/main/java/com/easypost/model/Surcharge.java diff --git a/CHANGELOG.md b/CHANGELOG.md index c241116d4..dbe729a24 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## Next Release +- Adds `surcharges` property and model to `Rate` object - Fix pagination parameters for `getNextPage` in `User` service ## v7.4.1 (2024-07-24) diff --git a/src/main/java/com/easypost/model/Rate.java b/src/main/java/com/easypost/model/Rate.java index f691fa2d6..be613a2b1 100644 --- a/src/main/java/com/easypost/model/Rate.java +++ b/src/main/java/com/easypost/model/Rate.java @@ -1,5 +1,7 @@ package com.easypost.model; +import java.util.List; + import lombok.Getter; @Getter @@ -19,4 +21,5 @@ public class Rate extends EasyPostResource { private String shipmentId; private String carrierAccountId; private String billingType; + private List surcharges; } diff --git a/src/main/java/com/easypost/model/Surcharge.java b/src/main/java/com/easypost/model/Surcharge.java new file mode 100644 index 000000000..4619f436a --- /dev/null +++ b/src/main/java/com/easypost/model/Surcharge.java @@ -0,0 +1,13 @@ +package com.easypost.model; + +import lombok.Getter; + +@Getter +public final class Surcharge extends EasyPostResource { + private String object; + private String type; + private String amount; + private String list_amount; + private String retail_amount; + private String currency; +} From f3c13db60f3e427ea3dbd8a30ce9cb95b1efede7 Mon Sep 17 00:00:00 2001 From: Justintime50 <39606064+Justintime50@users.noreply.github.com> Date: Wed, 7 Aug 2024 09:51:35 -0600 Subject: [PATCH 2/3] fix: don't extend EasyPostResrouce on Surcharge --- src/main/java/com/easypost/model/Surcharge.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/easypost/model/Surcharge.java b/src/main/java/com/easypost/model/Surcharge.java index 4619f436a..9f3e45e61 100644 --- a/src/main/java/com/easypost/model/Surcharge.java +++ b/src/main/java/com/easypost/model/Surcharge.java @@ -3,7 +3,7 @@ import lombok.Getter; @Getter -public final class Surcharge extends EasyPostResource { +public final class Surcharge { private String object; private String type; private String amount; From c3e8597646b9cdf0d45c7b7db326601abcf1beb5 Mon Sep 17 00:00:00 2001 From: Justintime50 <39606064+Justintime50@users.noreply.github.com> Date: Wed, 7 Aug 2024 09:52:15 -0600 Subject: [PATCH 3/3] fix: camelCase Surcharge properties --- src/main/java/com/easypost/model/Surcharge.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/easypost/model/Surcharge.java b/src/main/java/com/easypost/model/Surcharge.java index 9f3e45e61..3fe9eeef5 100644 --- a/src/main/java/com/easypost/model/Surcharge.java +++ b/src/main/java/com/easypost/model/Surcharge.java @@ -7,7 +7,7 @@ public final class Surcharge { private String object; private String type; private String amount; - private String list_amount; - private String retail_amount; + private String listAmount; + private String retailAmount; private String currency; }