Merge pull request #139 from EasyPost/v5.4.0

chore: prepare v5.4.0 for release

Author: Justintime50

CHANGELOG.md

@@ -1,8 +1,9 @@
 # CHANGELOG
 
-## Next Release
+## v5.4.0
 
 - Adds `PaymentMethod.all()`, `CreditCard.fund()`, and `CreditCard.delete()` functions.
+- Fixes a bug that did not merge local and remote objects correctly on update (eg: User, Referral)
 
 ## v5.3.0 (2022-05-19)
 

VERSION

@@ -1 +1 @@
-5.3.0
+5.4.0

pom.xml

@@ -6,7 +6,7 @@
     <groupId>com.easypost</groupId>
     <artifactId>easypost-api-client</artifactId>
 
-    <version>5.3.0</version>
+    <version>5.4.0</version>
     <packaging>jar</packaging>
 
     <name>com.easypost:easypost-api-client</name>

src/main/java/com/easypost/model/beta/EndShipper.java

@@ -35,13 +35,13 @@ public static EndShipper create(final Map<String, Object> params, final String a
         wrappedParams.put("address", params);
 
         return request(RequestMethod.POST, String.format("%s/%s", EasyPost.BETA_API_BASE, "end_shippers"),
-            wrappedParams, EndShipper.class, apiKey);
+                wrappedParams, EndShipper.class, apiKey);
     }
 
     /**
      * Retrieve EndShipper object from API.
      *
-     * @param id     ID of end shipper to retrieve.
+     * @param id ID of end shipper to retrieve.
      * @return EndShipper object.
      * @throws EasyPostException when the request fails.
      */
@@ -59,7 +59,7 @@ public static EndShipper retrieve(final String id) throws EasyPostException {
      */
     public static EndShipper retrieve(final String id, final String apiKey) throws EasyPostException {
         return request(RequestMethod.GET, String.format("%s/%s/%s",
-            EasyPost.BETA_API_BASE, "end_shippers", id), null, EndShipper.class, apiKey);
+                EasyPost.BETA_API_BASE, "end_shippers", id), null, EndShipper.class, apiKey);
     }
 
     /**
@@ -85,7 +85,7 @@ public static List<EndShipper> all(final Map<String, Object> params)
     public static List<EndShipper> all(final Map<String, Object> params, final String apiKey)
             throws EasyPostException {
         EndShipper[] response = request(RequestMethod.GET, String.format("%s/%s", EasyPost.BETA_API_BASE,
-            "end_shippers"), params, EndShipper[].class, apiKey);
+                "end_shippers"), params, EndShipper[].class, apiKey);
 
         return Arrays.asList(response);
     }
@@ -115,8 +115,9 @@ public EndShipper update(final Map<String, Object> params, final String apiKey)
         wrappedParams.put("address", params);
 
         EndShipper response = request(RequestMethod.PUT, String.format("%s/%s/%s", EasyPost.BETA_API_BASE,
-            "end_shippers", this.getId()), wrappedParams, EndShipper.class, apiKey);
+                "end_shippers", this.getId()), wrappedParams, EndShipper.class, apiKey);
 
-        return response;
+        this.merge(this, response);
+        return this;
     }
 }