From 37e621309986dbf495c9ba3a192eb26b504262a9 Mon Sep 17 00:00:00 2001 From: jchen293 Date: Mon, 31 Jan 2022 17:30:04 -0500 Subject: [PATCH 1/2] improve createlist for tracker. --- src/main/java/com/easypost/model/Tracker.java | 10 ++----- src/test/java/com/easypost/EasyPostTest.java | 29 +++++++------------ 2 files changed, 13 insertions(+), 26 deletions(-) diff --git a/src/main/java/com/easypost/model/Tracker.java b/src/main/java/com/easypost/model/Tracker.java index 7733b8dd9..a51cb0f6a 100644 --- a/src/main/java/com/easypost/model/Tracker.java +++ b/src/main/java/com/easypost/model/Tracker.java @@ -3,7 +3,6 @@ import com.easypost.exception.EasyPostException; import com.easypost.net.EasyPostResource; -import java.util.ArrayList; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -119,16 +118,11 @@ public static boolean createList(final Map params) throws EasyPo public static boolean createList(final Map params, final String apiKey) throws EasyPostException { String createListUrl = String.format("%s/create_list", classURL(Tracker.class)); - int count = 0; Map newParams = new HashMap(); - Map trackers = new HashMap(); - for (Object tracker : (ArrayList) params.get("trackers")) { - trackers.put(String.valueOf(count), tracker); - count++; - } - newParams.put("trackers", trackers); + newParams.put("trackers", params); request(RequestMethod.POST, createListUrl, newParams, Object.class, apiKey); + // This endpoint does not return a response so we return true here return true; } diff --git a/src/test/java/com/easypost/EasyPostTest.java b/src/test/java/com/easypost/EasyPostTest.java index e3e9b6e13..6a90018f5 100644 --- a/src/test/java/com/easypost/EasyPostTest.java +++ b/src/test/java/com/easypost/EasyPostTest.java @@ -354,25 +354,18 @@ public void testTrackerCreateAndRetrieve() throws EasyPostException, ParseExcept @Test public void testBatchTrackerCreate() throws EasyPostException { - List trackingCodes = new ArrayList(); - trackingCodes.add("EZ1000000001"); - trackingCodes.add("EZ2000000002"); - trackingCodes.add("EZ3000000003"); - - List> trackingCodeParams = new ArrayList>(); - HashMap code; - - for (int i = 0; i < trackingCodes.size(); i++) { - code = new HashMap(); - code.put("tracking_code", trackingCodes.get(i)); - code.put("carrier", "USPS"); - trackingCodeParams.add(code); - } - Map createListParams = new HashMap(); - createListParams.put("trackers", trackingCodeParams); + String[] trackingCodes = new String[]{"EZ1000000001", "EZ1000000002", "EZ1000000003"}; + HashMap trackingCodeParams = new HashMap(); + + for (int i = 0; i < trackingCodes.length; i++) { + HashMap tracker = new HashMap(); + tracker.put("tracking_code", trackingCodes[i]); + tracker.put("carrier", "USPS"); + trackingCodeParams.put(String.valueOf(i), tracker); + } - Tracker.createList(createListParams); + Tracker.createList(trackingCodeParams); } @Test @@ -1098,7 +1091,7 @@ public void testShipmentReportDates() throws EasyPostException { assertEquals("Incorrect ShipmentReport start_date", "Sun Oct 01 00:00:00 PDT 2017", shipmentReport2.getStartDate().toString()); assertEquals("Incorrect ShipmentReport end_date", "Mon Oct 30 00:00:00 PDT 2017", shipmentReport2.getEndDate().toString()); }*/ - + /* // This test requires a FedExSameDayCity account From 9f684798fac6dfc5e61af715cca14766083865ac Mon Sep 17 00:00:00 2001 From: jchen293 Date: Mon, 31 Jan 2022 17:32:04 -0500 Subject: [PATCH 2/2] update the variable name. --- src/test/java/com/easypost/EasyPostTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/test/java/com/easypost/EasyPostTest.java b/src/test/java/com/easypost/EasyPostTest.java index 6a90018f5..bb3040347 100644 --- a/src/test/java/com/easypost/EasyPostTest.java +++ b/src/test/java/com/easypost/EasyPostTest.java @@ -359,10 +359,10 @@ public void testBatchTrackerCreate() throws EasyPostException { HashMap trackingCodeParams = new HashMap(); for (int i = 0; i < trackingCodes.length; i++) { - HashMap tracker = new HashMap(); - tracker.put("tracking_code", trackingCodes[i]); - tracker.put("carrier", "USPS"); - trackingCodeParams.put(String.valueOf(i), tracker); + HashMap code = new HashMap(); + code.put("tracking_code", trackingCodes[i]); + code.put("carrier", "USPS"); + trackingCodeParams.put(String.valueOf(i), code); } Tracker.createList(trackingCodeParams);