diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b58c465 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +# Default ignored files +.idea +.target +target diff --git a/README.md b/README.md index c95dc0f..59435d6 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,7 @@ If you need support using AfterShip products, please contact support@aftership.c - [Endpoints](#endpoints) - [/trackings](#trackings) - [/couriers](#couriers) + - [/courier-connections](#courier-connections) - [/estimated-delivery-date](#estimated-delivery-date) - [Help](#help) - [License](#license) @@ -41,6 +42,7 @@ Each SDK version is designed to work with a specific API version. Please refer t | SDK Version | Supported API Version | Branch | | ----------- | --------------------- | ----------------------------------------------------------- | +| 9.x.x | 2025-04 | https://github.com/AfterShip/tracking-sdk-java/tree/2025-04 | | 8.x.x | 2025-01 | https://github.com/AfterShip/tracking-sdk-java/tree/2025-01 | | 7.x.x | 2024-10 | https://github.com/AfterShip/tracking-sdk-java/tree/2024-10 | | 6.x.x | 2024-07 | https://github.com/AfterShip/tracking-sdk-java/tree/2024-07 | @@ -55,7 +57,7 @@ Each SDK version is designed to work with a specific API version. Please refer t com.aftership tracking-sdk - 8.0.0 + 9.0.0 ``` @@ -106,7 +108,7 @@ public class App { ## Rate Limiter -See the [Rate Limit](https://www.aftership.com/docs/tracking/2025-01/quickstart/rate-limit) to understand the AfterShip rate limit policy. +See the [Rate Limit](https://www.aftership.com/docs/tracking/2025-04/quickstart/rate-limit) to understand the AfterShip rate limit policy. ## Error Handling @@ -155,6 +157,7 @@ The AfterShip instance has the following properties which are exactly the same a - courier - Get a list of our supported couriers. - tracking - Create trackings, update trackings, and get tracking results. +- courier-connection - Create courier connections, update courier connections, and get courier connections results. - estimated-delivery-date - Get estimated delivery date for your order. ### /trackings @@ -235,14 +238,7 @@ System.out.println(response.getTrackingNumber()); **GET** /couriers ```java -GetUserCouriersResponse response = CourierResource.getUserCouriers().fetch(); -System.out.println(response.getTotal()); -``` - -**GET** /couriers/all - -```java -GetAllCouriersResponse response = CourierResource.getAllCouriers().fetch(); +GetUserCouriersResponse response = CourierResource.getCouriers().fetch(); System.out.println(response.getTotal()); ``` diff --git a/pom.xml b/pom.xml index ccf4593..d60b262 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.aftership tracking-sdk - 8.0.0 + 9.0.0 AfterShip Tracking SDK The official AfterShip Tracking Java API library diff --git a/src/main/java/com/aftership/constant/ErrorEnum.java b/src/main/java/com/aftership/constant/ErrorEnum.java index 0347492..eacfd6a 100644 --- a/src/main/java/com/aftership/constant/ErrorEnum.java +++ b/src/main/java/com/aftership/constant/ErrorEnum.java @@ -64,6 +64,12 @@ public enum ErrorEnum { "You have exceeded the API call rate limit. The default limit is 10 requests per second."), INTERNAL_ERROR(500, 500, "Something went wrong on AfterShip's end."); + private final int code; + + private final int statusCode; + + private final String message; + private static final Map META = new HashMap<>(); static { @@ -72,24 +78,12 @@ public enum ErrorEnum { } } - private final int code; - private final int statusCode; - private final String message; - ErrorEnum(int code, int statusCode, String message) { this.code = code; this.statusCode = statusCode; this.message = message; } - public static int getByMetaCode(int code) { - ErrorEnum e = META.get(code); - if (e == null) { - return BAD_REQUEST.code; - } - return e.code; - } - public int getCode() { return code; } @@ -102,6 +96,14 @@ public String getMessage() { return message; } + public static int getByMetaCode(int code) { + ErrorEnum e = META.get(code); + if (e == null) { + return BAD_REQUEST.code; + } + return e.code; + } + @Override public String toString() { return "ErrorEnum{" + "code=" + code + ", message='" + message + '\'' + '}'; diff --git a/src/main/java/com/aftership/courier/CourierResource.java b/src/main/java/com/aftership/courier/CourierResource.java index 8170074..b9f781f 100644 --- a/src/main/java/com/aftership/courier/CourierResource.java +++ b/src/main/java/com/aftership/courier/CourierResource.java @@ -11,11 +11,7 @@ public static DetectCourierCreator detectCourier() { return new DetectCourierCreator(); } - public static GetUserCouriersFetcher getUserCouriers() { - return new GetUserCouriersFetcher(); - } - - public static GetAllCouriersFetcher getAllCouriers() { - return new GetAllCouriersFetcher(); + public static GetCouriersFetcher getCouriers() { + return new GetCouriersFetcher(); } } diff --git a/src/main/java/com/aftership/courier/DetectCourierCreator.java b/src/main/java/com/aftership/courier/DetectCourierCreator.java index 20f8810..bd41fbd 100644 --- a/src/main/java/com/aftership/courier/DetectCourierCreator.java +++ b/src/main/java/com/aftership/courier/DetectCourierCreator.java @@ -6,6 +6,7 @@ import com.aftership.base.Creator; import com.aftership.http.*; +import com.aftership.http.Request; import com.aftership.model.DetectCourierRequest; import com.aftership.model.DetectCourierResponse; import com.google.gson.Gson; @@ -15,7 +16,6 @@ public class DetectCourierCreator extends Creator { private final Map headerParams = new HashMap<>(8); - private DetectCourierRequest detectCourierRequest; public DetectCourierCreator addHeaderParam(final String name, final String value) { if (value == null || value.equals("null")) { @@ -34,6 +34,8 @@ private void setHeaderParams(final Request request) { } } + private DetectCourierRequest detectCourierRequest; + public DetectCourierCreator setDetectCourierRequest(DetectCourierRequest detectCourierRequest) { this.detectCourierRequest = detectCourierRequest; return this; @@ -41,7 +43,7 @@ public DetectCourierCreator setDetectCourierRequest(DetectCourierRequest detectC @Override public DetectCourierResponse create(AfterShipClient client) throws Exception { - String path = "/tracking/2025-01/couriers/detect"; + String path = "/tracking/2025-04/couriers/detect"; Request request = new Request(HttpMethod.POST, path); request.setBody((new Gson()).toJson(detectCourierRequest)); diff --git a/src/main/java/com/aftership/courier/GetAllCouriersFetcher.java b/src/main/java/com/aftership/courier/GetCouriersFetcher.java similarity index 50% rename from src/main/java/com/aftership/courier/GetAllCouriersFetcher.java rename to src/main/java/com/aftership/courier/GetCouriersFetcher.java index f4eb496..c7003a9 100644 --- a/src/main/java/com/aftership/courier/GetAllCouriersFetcher.java +++ b/src/main/java/com/aftership/courier/GetCouriersFetcher.java @@ -6,16 +6,17 @@ import com.aftership.base.Fetcher; import com.aftership.http.*; -import com.aftership.model.GetAllCouriersResponse; +import com.aftership.http.Request; +import com.aftership.model.GetCouriersResponse; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import java.util.HashMap; import java.util.Map; -public class GetAllCouriersFetcher extends Fetcher { +public class GetCouriersFetcher extends Fetcher { private final Map headerParams = new HashMap<>(8); - public GetAllCouriersFetcher addHeaderParam(final String name, final String value) { + public GetCouriersFetcher addHeaderParam(final String name, final String value) { if (value == null || value.equals("null")) { return this; } @@ -32,17 +33,41 @@ private void setHeaderParams(final Request request) { } } + private Boolean active; + + private String slug; + + public GetCouriersFetcher setActive(Boolean active) { + this.active = active; + return this; + } + + public GetCouriersFetcher setSlug(String slug) { + this.slug = slug; + return this; + } + @Override - public GetAllCouriersResponse fetch(AfterShipClient client) throws Exception { - String path = "/tracking/2025-01/couriers/all"; + public GetCouriersResponse fetch(AfterShipClient client) throws Exception { + String path = "/tracking/2025-04/couriers"; Request request = new Request(HttpMethod.GET, path); + addQueryParams(request); setHeaderParams(request); Response response = client.request(request); - AfterShipResponse trackingResponse = + AfterShipResponse trackingResponse = new Gson() .fromJson( response.getContent(), - new TypeToken>() {}.getType()); + new TypeToken>() {}.getType()); return trackingResponse.getData(); } + + private void addQueryParams(final Request request) { + if (active != null) { + request.addQueryParam("active", String.valueOf(active)); + } + if (slug != null) { + request.addQueryParam("slug", slug); + } + } } diff --git a/src/main/java/com/aftership/courier_connection/CourierConnectionResource.java b/src/main/java/com/aftership/courier_connection/CourierConnectionResource.java new file mode 100644 index 0000000..7a551b4 --- /dev/null +++ b/src/main/java/com/aftership/courier_connection/CourierConnectionResource.java @@ -0,0 +1,29 @@ +/* + * This code was auto generated by AfterShip SDK Generator. + * Do not edit the class manually. + */ +package com.aftership.courier_connection; + +import com.aftership.base.Resource; + +public class CourierConnectionResource extends Resource { + public static GetCourierConnectionsByIdFetcher getCourierConnectionsById() { + return new GetCourierConnectionsByIdFetcher(); + } + + public static GetCourierConnectionsReader getCourierConnections() { + return new GetCourierConnectionsReader(); + } + + public static PutCourierConnectionsByIdUpdater putCourierConnectionsById() { + return new PutCourierConnectionsByIdUpdater(); + } + + public static DeleteCourierConnectionsByIdDeleter deleteCourierConnectionsById() { + return new DeleteCourierConnectionsByIdDeleter(); + } + + public static PostCourierConnectionsCreator postCourierConnections() { + return new PostCourierConnectionsCreator(); + } +} diff --git a/src/main/java/com/aftership/courier_connection/DeleteCourierConnectionsByIdDeleter.java b/src/main/java/com/aftership/courier_connection/DeleteCourierConnectionsByIdDeleter.java new file mode 100644 index 0000000..9fd2b12 --- /dev/null +++ b/src/main/java/com/aftership/courier_connection/DeleteCourierConnectionsByIdDeleter.java @@ -0,0 +1,63 @@ +/* + * This code was auto generated by AfterShip SDK Generator. + * Do not edit the class manually. + */ +package com.aftership.courier_connection; + +import com.aftership.base.Deleter; +import com.aftership.constant.ErrorEnum; +import com.aftership.exception.ApiException; +import com.aftership.http.*; +import com.aftership.http.Request; +import com.aftership.model.CourierConnection; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; +import java.util.HashMap; +import java.util.Map; + +public class DeleteCourierConnectionsByIdDeleter extends Deleter { + private final Map headerParams = new HashMap<>(8); + + public DeleteCourierConnectionsByIdDeleter addHeaderParam(final String name, final String value) { + if (value == null || value.equals("null")) { + return this; + } + + if (!headerParams.containsKey(name)) { + headerParams.put(name, value); + } + return this; + } + + private void setHeaderParams(final Request request) { + for (final Map.Entry entry : headerParams.entrySet()) { + request.addHeaderParam(entry.getKey(), entry.getValue()); + } + } + + private String id; + + public DeleteCourierConnectionsByIdDeleter setId(String id) { + this.id = id; + return this; + } + + @Override + public CourierConnection delete(AfterShipClient client) throws Exception { + if (id == null || id.isEmpty()) { + throw new ApiException( + ErrorEnum.BAD_REQUEST.getCode(), + ErrorEnum.BAD_REQUEST.getMessage() + ": `id` is invalid"); + } + String path = String.format("/tracking/2025-04/courier-connections/%s", id); + Request request = new Request(HttpMethod.DELETE, path); + setHeaderParams(request); + Response response = client.request(request); + AfterShipResponse trackingResponse = + new Gson() + .fromJson( + response.getContent(), + new TypeToken>() {}.getType()); + return trackingResponse.getData(); + } +} diff --git a/src/main/java/com/aftership/courier/GetUserCouriersFetcher.java b/src/main/java/com/aftership/courier_connection/GetCourierConnectionsByIdFetcher.java similarity index 50% rename from src/main/java/com/aftership/courier/GetUserCouriersFetcher.java rename to src/main/java/com/aftership/courier_connection/GetCourierConnectionsByIdFetcher.java index e7450e8..6378799 100644 --- a/src/main/java/com/aftership/courier/GetUserCouriersFetcher.java +++ b/src/main/java/com/aftership/courier_connection/GetCourierConnectionsByIdFetcher.java @@ -2,20 +2,23 @@ * This code was auto generated by AfterShip SDK Generator. * Do not edit the class manually. */ -package com.aftership.courier; +package com.aftership.courier_connection; import com.aftership.base.Fetcher; +import com.aftership.constant.ErrorEnum; +import com.aftership.exception.ApiException; import com.aftership.http.*; -import com.aftership.model.GetUserCouriersResponse; +import com.aftership.http.Request; +import com.aftership.model.CourierConnection; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import java.util.HashMap; import java.util.Map; -public class GetUserCouriersFetcher extends Fetcher { +public class GetCourierConnectionsByIdFetcher extends Fetcher { private final Map headerParams = new HashMap<>(8); - public GetUserCouriersFetcher addHeaderParam(final String name, final String value) { + public GetCourierConnectionsByIdFetcher addHeaderParam(final String name, final String value) { if (value == null || value.equals("null")) { return this; } @@ -32,17 +35,29 @@ private void setHeaderParams(final Request request) { } } + private String id; + + public GetCourierConnectionsByIdFetcher setId(String id) { + this.id = id; + return this; + } + @Override - public GetUserCouriersResponse fetch(AfterShipClient client) throws Exception { - String path = "/tracking/2025-01/couriers"; + public CourierConnection fetch(AfterShipClient client) throws Exception { + if (id == null || id.isEmpty()) { + throw new ApiException( + ErrorEnum.BAD_REQUEST.getCode(), + ErrorEnum.BAD_REQUEST.getMessage() + ": `id` is invalid"); + } + String path = String.format("/tracking/2025-04/courier-connections/%s", id); Request request = new Request(HttpMethod.GET, path); setHeaderParams(request); Response response = client.request(request); - AfterShipResponse trackingResponse = + AfterShipResponse trackingResponse = new Gson() .fromJson( response.getContent(), - new TypeToken>() {}.getType()); + new TypeToken>() {}.getType()); return trackingResponse.getData(); } } diff --git a/src/main/java/com/aftership/courier_connection/GetCourierConnectionsReader.java b/src/main/java/com/aftership/courier_connection/GetCourierConnectionsReader.java new file mode 100644 index 0000000..e6b043d --- /dev/null +++ b/src/main/java/com/aftership/courier_connection/GetCourierConnectionsReader.java @@ -0,0 +1,92 @@ +/* + * This code was auto generated by AfterShip SDK Generator. + * Do not edit the class manually. + */ +package com.aftership.courier_connection; + +import com.aftership.base.Page; +import com.aftership.base.Reader; +import com.aftership.http.*; +import com.aftership.http.Request; +import com.aftership.model.CourierConnection; +import com.aftership.model.GetCourierConnectionsResponse; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; +import java.util.HashMap; +import java.util.Map; + +public class GetCourierConnectionsReader extends Reader { + private final Map headerParams = new HashMap<>(8); + + public GetCourierConnectionsReader addHeaderParam(final String name, final String value) { + if (value == null || value.equals("null")) { + return this; + } + + if (!headerParams.containsKey(name)) { + headerParams.put(name, value); + } + return this; + } + + private void setHeaderParams(final Request request) { + for (final Map.Entry entry : headerParams.entrySet()) { + request.addHeaderParam(entry.getKey(), entry.getValue()); + } + } + + private String courierSlug; + + private String cursor; + + private String limit; + + public GetCourierConnectionsReader setCourierSlug(String courierSlug) { + this.courierSlug = courierSlug; + return this; + } + + public GetCourierConnectionsReader setCursor(String cursor) { + this.cursor = cursor; + return this; + } + + public GetCourierConnectionsReader setLimit(String limit) { + this.limit = limit; + return this; + } + + @Override + public Page read(AfterShipClient client) throws Exception { + String path = "/tracking/2025-04/courier-connections"; + Request request = new Request(HttpMethod.GET, path); + addQueryParams(request); + setHeaderParams(request); + Response response = client.request(request); + AfterShipResponse trackingResponse = + new Gson() + .fromJson( + response.getContent(), + new TypeToken>() {}.getType()); + Page pageResponse = new Page<>(); + pageResponse + .setNextCursor(trackingResponse.getData().getPagination().getNextCursor()) + .setHasNextCursor(trackingResponse.getData().getPagination().getHasNextPage()) + .setTotal(trackingResponse.getData().getPagination().getTotal()) + .setRecords(trackingResponse.getData().getCourierConnections()); + + return pageResponse; + } + + private void addQueryParams(final Request request) { + if (courierSlug != null) { + request.addQueryParam("courier_slug", courierSlug); + } + if (cursor != null) { + request.addQueryParam("cursor", cursor); + } + if (limit != null) { + request.addQueryParam("limit", limit); + } + } +} diff --git a/src/main/java/com/aftership/courier_connection/PostCourierConnectionsCreator.java b/src/main/java/com/aftership/courier_connection/PostCourierConnectionsCreator.java new file mode 100644 index 0000000..876410a --- /dev/null +++ b/src/main/java/com/aftership/courier_connection/PostCourierConnectionsCreator.java @@ -0,0 +1,60 @@ +/* + * This code was auto generated by AfterShip SDK Generator. + * Do not edit the class manually. + */ +package com.aftership.courier_connection; + +import com.aftership.base.Creator; +import com.aftership.http.*; +import com.aftership.http.Request; +import com.aftership.model.CourierConnection; +import com.aftership.model.PostCourierConnectionsRequest; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; +import java.util.HashMap; +import java.util.Map; + +public class PostCourierConnectionsCreator extends Creator { + private final Map headerParams = new HashMap<>(8); + + public PostCourierConnectionsCreator addHeaderParam(final String name, final String value) { + if (value == null || value.equals("null")) { + return this; + } + + if (!headerParams.containsKey(name)) { + headerParams.put(name, value); + } + return this; + } + + private void setHeaderParams(final Request request) { + for (final Map.Entry entry : headerParams.entrySet()) { + request.addHeaderParam(entry.getKey(), entry.getValue()); + } + } + + private PostCourierConnectionsRequest postCourierConnectionsRequest; + + public PostCourierConnectionsCreator setPostCourierConnectionsRequest( + PostCourierConnectionsRequest postCourierConnectionsRequest) { + this.postCourierConnectionsRequest = postCourierConnectionsRequest; + return this; + } + + @Override + public CourierConnection create(AfterShipClient client) throws Exception { + String path = "/tracking/2025-04/courier-connections"; + Request request = new Request(HttpMethod.POST, path); + request.setBody((new Gson()).toJson(postCourierConnectionsRequest)); + + setHeaderParams(request); + Response response = client.request(request); + AfterShipResponse trackingResponse = + new Gson() + .fromJson( + response.getContent(), + new TypeToken>() {}.getType()); + return trackingResponse.getData(); + } +} diff --git a/src/main/java/com/aftership/courier_connection/PutCourierConnectionsByIdUpdater.java b/src/main/java/com/aftership/courier_connection/PutCourierConnectionsByIdUpdater.java new file mode 100644 index 0000000..cc623d7 --- /dev/null +++ b/src/main/java/com/aftership/courier_connection/PutCourierConnectionsByIdUpdater.java @@ -0,0 +1,74 @@ +/* + * This code was auto generated by AfterShip SDK Generator. + * Do not edit the class manually. + */ +package com.aftership.courier_connection; + +import com.aftership.base.Updater; +import com.aftership.constant.ErrorEnum; +import com.aftership.exception.ApiException; +import com.aftership.http.*; +import com.aftership.http.Request; +import com.aftership.model.CourierConnection; +import com.aftership.model.PutCourierConnectionsByIdRequest; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; +import java.util.HashMap; +import java.util.Map; + +public class PutCourierConnectionsByIdUpdater extends Updater { + private final Map headerParams = new HashMap<>(8); + + public PutCourierConnectionsByIdUpdater addHeaderParam(final String name, final String value) { + if (value == null || value.equals("null")) { + return this; + } + + if (!headerParams.containsKey(name)) { + headerParams.put(name, value); + } + return this; + } + + private void setHeaderParams(final Request request) { + for (final Map.Entry entry : headerParams.entrySet()) { + request.addHeaderParam(entry.getKey(), entry.getValue()); + } + } + + private PutCourierConnectionsByIdRequest putCourierConnectionsByIdRequest; + + public PutCourierConnectionsByIdUpdater setPutCourierConnectionsByIdRequest( + PutCourierConnectionsByIdRequest putCourierConnectionsByIdRequest) { + this.putCourierConnectionsByIdRequest = putCourierConnectionsByIdRequest; + return this; + } + + private String id; + + public PutCourierConnectionsByIdUpdater setId(String id) { + this.id = id; + return this; + } + + @Override + public CourierConnection update(AfterShipClient client) throws Exception { + if (id == null || id.isEmpty()) { + throw new ApiException( + ErrorEnum.BAD_REQUEST.getCode(), + ErrorEnum.BAD_REQUEST.getMessage() + ": `id` is invalid"); + } + String path = String.format("/tracking/2025-04/courier-connections/%s", id); + Request request = new Request(HttpMethod.PATCH, path); + request.setBody((new Gson()).toJson(putCourierConnectionsByIdRequest)); + + setHeaderParams(request); + Response response = client.request(request); + AfterShipResponse trackingResponse = + new Gson() + .fromJson( + response.getContent(), + new TypeToken>() {}.getType()); + return trackingResponse.getData(); + } +} diff --git a/src/main/java/com/aftership/estimated_delivery_date/EstimatedDeliveryDateResource.java b/src/main/java/com/aftership/estimated_delivery_date/EstimatedDeliveryDateResource.java index b01e317..f3e7125 100644 --- a/src/main/java/com/aftership/estimated_delivery_date/EstimatedDeliveryDateResource.java +++ b/src/main/java/com/aftership/estimated_delivery_date/EstimatedDeliveryDateResource.java @@ -7,11 +7,11 @@ import com.aftership.base.Resource; public class EstimatedDeliveryDateResource extends Resource { - public static PredictBatchCreator predictBatch() { - return new PredictBatchCreator(); - } - public static PredictCreator predict() { return new PredictCreator(); } + + public static PredictBatchCreator predictBatch() { + return new PredictBatchCreator(); + } } diff --git a/src/main/java/com/aftership/estimated_delivery_date/PredictBatchCreator.java b/src/main/java/com/aftership/estimated_delivery_date/PredictBatchCreator.java index 5dce320..5a7bef4 100644 --- a/src/main/java/com/aftership/estimated_delivery_date/PredictBatchCreator.java +++ b/src/main/java/com/aftership/estimated_delivery_date/PredictBatchCreator.java @@ -6,6 +6,7 @@ import com.aftership.base.Creator; import com.aftership.http.*; +import com.aftership.http.Request; import com.aftership.model.PredictBatchRequest; import com.aftership.model.PredictBatchResponse; import com.google.gson.Gson; @@ -15,7 +16,6 @@ public class PredictBatchCreator extends Creator { private final Map headerParams = new HashMap<>(8); - private PredictBatchRequest predictBatchRequest; public PredictBatchCreator addHeaderParam(final String name, final String value) { if (value == null || value.equals("null")) { @@ -34,6 +34,8 @@ private void setHeaderParams(final Request request) { } } + private PredictBatchRequest predictBatchRequest; + public PredictBatchCreator setPredictBatchRequest(PredictBatchRequest predictBatchRequest) { this.predictBatchRequest = predictBatchRequest; return this; @@ -41,7 +43,7 @@ public PredictBatchCreator setPredictBatchRequest(PredictBatchRequest predictBat @Override public PredictBatchResponse create(AfterShipClient client) throws Exception { - String path = "/tracking/2025-01/estimated-delivery-date/predict-batch"; + String path = "/tracking/2025-04/estimated-delivery-date/predict-batch"; Request request = new Request(HttpMethod.POST, path); request.setBody((new Gson()).toJson(predictBatchRequest)); diff --git a/src/main/java/com/aftership/estimated_delivery_date/PredictCreator.java b/src/main/java/com/aftership/estimated_delivery_date/PredictCreator.java index 8a0a715..81220d7 100644 --- a/src/main/java/com/aftership/estimated_delivery_date/PredictCreator.java +++ b/src/main/java/com/aftership/estimated_delivery_date/PredictCreator.java @@ -6,6 +6,7 @@ import com.aftership.base.Creator; import com.aftership.http.*; +import com.aftership.http.Request; import com.aftership.model.EstimatedDeliveryDateRequest; import com.aftership.model.EstimatedDeliveryDateResponse; import com.google.gson.Gson; @@ -15,7 +16,6 @@ public class PredictCreator extends Creator { private final Map headerParams = new HashMap<>(8); - private EstimatedDeliveryDateRequest predictRequest; public PredictCreator addHeaderParam(final String name, final String value) { if (value == null || value.equals("null")) { @@ -34,6 +34,8 @@ private void setHeaderParams(final Request request) { } } + private EstimatedDeliveryDateRequest predictRequest; + public PredictCreator setEstimatedDeliveryDateRequest( EstimatedDeliveryDateRequest predictRequest) { this.predictRequest = predictRequest; @@ -42,7 +44,7 @@ public PredictCreator setEstimatedDeliveryDateRequest( @Override public EstimatedDeliveryDateResponse create(AfterShipClient client) throws Exception { - String path = "/tracking/2025-01/estimated-delivery-date/predict"; + String path = "/tracking/2025-04/estimated-delivery-date/predict"; Request request = new Request(HttpMethod.POST, path); request.setBody((new Gson()).toJson(predictRequest)); diff --git a/src/main/java/com/aftership/http/HttpClient.java b/src/main/java/com/aftership/http/HttpClient.java index c384981..3ce0223 100644 --- a/src/main/java/com/aftership/http/HttpClient.java +++ b/src/main/java/com/aftership/http/HttpClient.java @@ -27,7 +27,7 @@ public class HttpClient { private static final String DEFAULT_USER_AGENT = - "aftership-sdk-java/8.0.0 (https://www.aftership.com) apache-httpclient/4.5.14"; + "aftership-sdk-java/9.0.0 (https://www.aftership.com) apache-httpclient/4.5.14"; protected final org.apache.http.client.HttpClient client; private final String domain; diff --git a/src/main/java/com/aftership/http/Request.java b/src/main/java/com/aftership/http/Request.java index adad665..3d0114a 100644 --- a/src/main/java/com/aftership/http/Request.java +++ b/src/main/java/com/aftership/http/Request.java @@ -18,9 +18,9 @@ public class Request { private final HttpMethod method; private final String path; - private final String date; private String queryString; private String body; + private final String date; public Request(HttpMethod method, String path) { this.method = method; @@ -128,14 +128,14 @@ public String getBody() { return body; } - public void setBody(String body) { - this.body = body; - } - public Map getHeaders() { return headerParams; } + public void setBody(String body) { + this.body = body; + } + public String getQueryString() { return queryString; } diff --git a/src/main/java/com/aftership/model/AdditionalFields.java b/src/main/java/com/aftership/model/AdditionalFields.java new file mode 100644 index 0000000..8db5f0e --- /dev/null +++ b/src/main/java/com/aftership/model/AdditionalFields.java @@ -0,0 +1,40 @@ +/* + * This code was auto generated by AfterShip SDK Generator. + * Do not edit the class manually. + */ +package com.aftership.model; + +import com.google.gson.annotations.SerializedName; + +public enum AdditionalFields { + @SerializedName("tracking_account_number") + TrackingAccountNumber("tracking_account_number"), + + @SerializedName("destination_postal_code") + DestinationPostalCode("destination_postal_code"), + + @SerializedName("destination_state") + DestinationState("destination_state"), + + @SerializedName("tracking_key") + TrackingKey("tracking_key"), + + @SerializedName("origin_country_region") + OriginCountryRegion("origin_country_region"), + + @SerializedName("destination_country_region") + DestinationCountryRegion("destination_country_region"), + + @SerializedName("tracking_ship_date") + TrackingShipDate("tracking_ship_date"); + + private final String content; + + AdditionalFields(final String content) { + this.content = content; + } + + public String toString() { + return content; + } +} diff --git a/src/main/java/com/aftership/model/AdditionalFieldsV1.java b/src/main/java/com/aftership/model/AdditionalFieldsV1.java deleted file mode 100644 index f7f858a..0000000 --- a/src/main/java/com/aftership/model/AdditionalFieldsV1.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * This code was auto generated by AfterShip SDK Generator. - * Do not edit the class manually. - */ -package com.aftership.model; - -import com.google.gson.annotations.SerializedName; - -public enum AdditionalFieldsV1 { - @SerializedName("tracking_account_number") - TrackingAccountNumber("tracking_account_number"), - - @SerializedName("tracking_postal_code") - TrackingPostalCode("tracking_postal_code"), - - @SerializedName("tracking_ship_date") - TrackingShipDate("tracking_ship_date"), - - @SerializedName("tracking_key") - TrackingKey("tracking_key"), - - @SerializedName("tracking_origin_country_region") - TrackingOriginCountryRegion("tracking_origin_country_region"), - - @SerializedName("tracking_destination_country_region") - TrackingDestinationCountryRegion("tracking_destination_country_region"), - - @SerializedName("tracking_state") - TrackingState("tracking_state"); - - private final String content; - - AdditionalFieldsV1(final String content) { - this.content = content; - } - - public String toString() { - return content; - } -} diff --git a/src/main/java/com/aftership/model/Checkpoint.java b/src/main/java/com/aftership/model/Checkpoint.java index 5d6c656..f43509b 100644 --- a/src/main/java/com/aftership/model/Checkpoint.java +++ b/src/main/java/com/aftership/model/Checkpoint.java @@ -43,7 +43,7 @@ public class Checkpoint extends Resource { private String message; @SerializedName("tag") - private TagV1 tag; + private Tag tag; @SerializedName("subtag") private String subtag; @@ -148,11 +148,11 @@ public void setMessage(String message) { this.message = message; } - public TagV1 getTag() { + public Tag getTag() { return tag; } - public void setTag(TagV1 tag) { + public void setTag(Tag tag) { this.tag = tag; } diff --git a/src/main/java/com/aftership/model/Courier.java b/src/main/java/com/aftership/model/Courier.java index 4cfe2aa..eeb4208 100644 --- a/src/main/java/com/aftership/model/Courier.java +++ b/src/main/java/com/aftership/model/Courier.java @@ -39,6 +39,9 @@ public class Courier extends Resource { @SerializedName("service_from_country_regions") private java.util.List serviceFromCountryRegions; + @SerializedName("credentials") + private CredentialsCourier credentials; + public String getSlug() { return slug; } @@ -118,4 +121,12 @@ public java.util.List getServiceFromCountryRegions() { public void setServiceFromCountryRegions(java.util.List serviceFromCountryRegions) { this.serviceFromCountryRegions = serviceFromCountryRegions; } + + public CredentialsCourier getCredentials() { + return credentials; + } + + public void setCredentials(CredentialsCourier credentials) { + this.credentials = credentials; + } } diff --git a/src/main/java/com/aftership/model/CourierConnection.java b/src/main/java/com/aftership/model/CourierConnection.java new file mode 100644 index 0000000..70f19a9 --- /dev/null +++ b/src/main/java/com/aftership/model/CourierConnection.java @@ -0,0 +1,66 @@ +/* + * This code was auto generated by AfterShip SDK Generator. + * Do not edit the class manually. + */ +package com.aftership.model; + +import com.aftership.base.Resource; +import com.google.gson.annotations.SerializedName; + +public class CourierConnection extends Resource { + + @SerializedName("id") + private String id; + + @SerializedName("courier_slug") + private String courierSlug; + + @SerializedName("credentials") + private java.util.Map credentials; + + @SerializedName("created_at") + private String createdAt; + + @SerializedName("updated_at") + private String updatedAt; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCourierSlug() { + return courierSlug; + } + + public void setCourierSlug(String courierSlug) { + this.courierSlug = courierSlug; + } + + public java.util.Map getCredentials() { + return credentials; + } + + public void setCredentials(java.util.Map credentials) { + this.credentials = credentials; + } + + public String getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(String createdAt) { + this.createdAt = createdAt; + } + + public String getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(String updatedAt) { + this.updatedAt = updatedAt; + } +} diff --git a/src/main/java/com/aftership/model/CourierConnectionResponseForGetCourierConnections.java b/src/main/java/com/aftership/model/CourierConnectionResponseForGetCourierConnections.java new file mode 100644 index 0000000..34be7f1 --- /dev/null +++ b/src/main/java/com/aftership/model/CourierConnectionResponseForGetCourierConnections.java @@ -0,0 +1,33 @@ +/* + * This code was auto generated by AfterShip SDK Generator. + * Do not edit the class manually. + */ +package com.aftership.model; + +import com.aftership.base.Resource; +import com.google.gson.annotations.SerializedName; + +public class CourierConnectionResponseForGetCourierConnections extends Resource { + + @SerializedName("meta") + private Meta meta; + + @SerializedName("data") + private DataCourierConnectionResponseForGetCourierConnections data; + + public Meta getMeta() { + return meta; + } + + public void setMeta(Meta meta) { + this.meta = meta; + } + + public DataCourierConnectionResponseForGetCourierConnections getData() { + return data; + } + + public void setData(DataCourierConnectionResponseForGetCourierConnections data) { + this.data = data; + } +} diff --git a/src/main/java/com/aftership/model/CourierResponseV1.java b/src/main/java/com/aftership/model/CourierResponse.java similarity index 57% rename from src/main/java/com/aftership/model/CourierResponseV1.java rename to src/main/java/com/aftership/model/CourierResponse.java index 8f19807..4d5a481 100644 --- a/src/main/java/com/aftership/model/CourierResponseV1.java +++ b/src/main/java/com/aftership/model/CourierResponse.java @@ -7,27 +7,27 @@ import com.aftership.base.Resource; import com.google.gson.annotations.SerializedName; -public class CourierResponseV1 extends Resource { +public class CourierResponse extends Resource { @SerializedName("meta") - private MetaV1 meta; + private Meta meta; @SerializedName("data") - private DataCourierResponseV1 data; + private DataCourierResponse data; - public MetaV1 getMeta() { + public Meta getMeta() { return meta; } - public void setMeta(MetaV1 meta) { + public void setMeta(Meta meta) { this.meta = meta; } - public DataCourierResponseV1 getData() { + public DataCourierResponse getData() { return data; } - public void setData(DataCourierResponseV1 data) { + public void setData(DataCourierResponse data) { this.data = data; } } diff --git a/src/main/java/com/aftership/model/CreateTrackingRequest.java b/src/main/java/com/aftership/model/CreateTrackingRequest.java index b0dcdac..2ef4f33 100644 --- a/src/main/java/com/aftership/model/CreateTrackingRequest.java +++ b/src/main/java/com/aftership/model/CreateTrackingRequest.java @@ -9,6 +9,9 @@ public class CreateTrackingRequest extends Resource { + @SerializedName("id") + private String id; + @SerializedName("tracking_number") private String trackingNumber; @@ -21,12 +24,12 @@ public class CreateTrackingRequest extends Resource { @SerializedName("order_id") private String orderId; - @SerializedName("order_id_path") - private String orderIdPath; - @SerializedName("custom_fields") private java.util.Map customFields; + @SerializedName("order_id_path") + private String orderIdPath; + @SerializedName("language") private String language; @@ -85,7 +88,7 @@ public class CreateTrackingRequest extends Resource { private String note; @SerializedName("slug_group") - private SlugGroupV1 slugGroup; + private SlugGroup slugGroup; @SerializedName("order_date") private String orderDate; @@ -102,18 +105,6 @@ public class CreateTrackingRequest extends Resource { @SerializedName("courier_connection_id") private String courierConnectionId; - @SerializedName("tracking_origin_country_region") - private String trackingOriginCountryRegion; - - @SerializedName("tracking_destination_country_region") - private String trackingDestinationCountryRegion; - - @SerializedName("tracking_postal_code") - private String trackingPostalCode; - - @SerializedName("tracking_state") - private String trackingState; - @SerializedName("location_id") private String locationId; @@ -126,6 +117,14 @@ public class CreateTrackingRequest extends Resource { @SerializedName("customers") private java.util.List customers; + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getTrackingNumber() { return trackingNumber; } @@ -158,14 +157,6 @@ public void setOrderId(String orderId) { this.orderId = orderId; } - public String getOrderIdPath() { - return orderIdPath; - } - - public void setOrderIdPath(String orderIdPath) { - this.orderIdPath = orderIdPath; - } - public java.util.Map getCustomFields() { return customFields; } @@ -174,6 +165,14 @@ public void setCustomFields(java.util.Map customFields) { this.customFields = customFields; } + public String getOrderIdPath() { + return orderIdPath; + } + + public void setOrderIdPath(String orderIdPath) { + this.orderIdPath = orderIdPath; + } + public String getLanguage() { return language; } @@ -326,11 +325,11 @@ public void setNote(String note) { this.note = note; } - public SlugGroupV1 getSlugGroup() { + public SlugGroup getSlugGroup() { return slugGroup; } - public void setSlugGroup(SlugGroupV1 slugGroup) { + public void setSlugGroup(SlugGroup slugGroup) { this.slugGroup = slugGroup; } @@ -374,38 +373,6 @@ public void setCourierConnectionId(String courierConnectionId) { this.courierConnectionId = courierConnectionId; } - public String getTrackingOriginCountryRegion() { - return trackingOriginCountryRegion; - } - - public void setTrackingOriginCountryRegion(String trackingOriginCountryRegion) { - this.trackingOriginCountryRegion = trackingOriginCountryRegion; - } - - public String getTrackingDestinationCountryRegion() { - return trackingDestinationCountryRegion; - } - - public void setTrackingDestinationCountryRegion(String trackingDestinationCountryRegion) { - this.trackingDestinationCountryRegion = trackingDestinationCountryRegion; - } - - public String getTrackingPostalCode() { - return trackingPostalCode; - } - - public void setTrackingPostalCode(String trackingPostalCode) { - this.trackingPostalCode = trackingPostalCode; - } - - public String getTrackingState() { - return trackingState; - } - - public void setTrackingState(String trackingState) { - this.trackingState = trackingState; - } - public String getLocationId() { return locationId; } diff --git a/src/main/java/com/aftership/model/CreateTrackingResponse.java b/src/main/java/com/aftership/model/CreateTrackingResponse.java index 100ee8d..8775ffd 100644 --- a/src/main/java/com/aftership/model/CreateTrackingResponse.java +++ b/src/main/java/com/aftership/model/CreateTrackingResponse.java @@ -106,7 +106,7 @@ public class CreateTrackingResponse extends Resource { private String source; @SerializedName("tag") - private TagV1 tag; + private Tag tag; @SerializedName("subtag") private String subtag; @@ -201,18 +201,6 @@ public class CreateTrackingResponse extends Resource { @SerializedName("courier_connection_id") private String courierConnectionId; - @SerializedName("tracking_origin_country_region") - private String trackingOriginCountryRegion; - - @SerializedName("tracking_destination_country_region") - private String trackingDestinationCountryRegion; - - @SerializedName("tracking_postal_code") - private String trackingPostalCode; - - @SerializedName("tracking_state") - private String trackingState; - @SerializedName("carbon_emissions") private CarbonEmissionsCreateTrackingResponse carbonEmissions; @@ -503,11 +491,11 @@ public void setSource(String source) { this.source = source; } - public TagV1 getTag() { + public Tag getTag() { return tag; } - public void setTag(TagV1 tag) { + public void setTag(Tag tag) { this.tag = tag; } @@ -763,38 +751,6 @@ public void setCourierConnectionId(String courierConnectionId) { this.courierConnectionId = courierConnectionId; } - public String getTrackingOriginCountryRegion() { - return trackingOriginCountryRegion; - } - - public void setTrackingOriginCountryRegion(String trackingOriginCountryRegion) { - this.trackingOriginCountryRegion = trackingOriginCountryRegion; - } - - public String getTrackingDestinationCountryRegion() { - return trackingDestinationCountryRegion; - } - - public void setTrackingDestinationCountryRegion(String trackingDestinationCountryRegion) { - this.trackingDestinationCountryRegion = trackingDestinationCountryRegion; - } - - public String getTrackingPostalCode() { - return trackingPostalCode; - } - - public void setTrackingPostalCode(String trackingPostalCode) { - this.trackingPostalCode = trackingPostalCode; - } - - public String getTrackingState() { - return trackingState; - } - - public void setTrackingState(String trackingState) { - this.trackingState = trackingState; - } - public CarbonEmissionsCreateTrackingResponse getCarbonEmissions() { return carbonEmissions; } diff --git a/src/main/java/com/aftership/model/CredentialField.java b/src/main/java/com/aftership/model/CredentialField.java new file mode 100644 index 0000000..5f34272 --- /dev/null +++ b/src/main/java/com/aftership/model/CredentialField.java @@ -0,0 +1,44 @@ +/* + * This code was auto generated by AfterShip SDK Generator. + * Do not edit the class manually. + */ +package com.aftership.model; + +import com.aftership.base.Resource; +import com.google.gson.annotations.SerializedName; + +public class CredentialField extends Resource { + + @SerializedName("name") + private String name; + + @SerializedName("type") + private String type; + + @SerializedName("required") + private Boolean required; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public Boolean getRequired() { + return required; + } + + public void setRequired(Boolean required) { + this.required = required; + } +} diff --git a/src/main/java/com/aftership/model/CredentialsCourier.java b/src/main/java/com/aftership/model/CredentialsCourier.java new file mode 100644 index 0000000..15717e0 --- /dev/null +++ b/src/main/java/com/aftership/model/CredentialsCourier.java @@ -0,0 +1,22 @@ +/* + * This code was auto generated by AfterShip SDK Generator. + * Do not edit the class manually. + */ +package com.aftership.model; + +import com.aftership.base.Resource; +import com.google.gson.annotations.SerializedName; + +public class CredentialsCourier extends Resource { + + @SerializedName("fields") + private java.util.List fields; + + public java.util.List getFields() { + return fields; + } + + public void setFields(java.util.List fields) { + this.fields = fields; + } +} diff --git a/src/main/java/com/aftership/model/DataCourierConnectionResponseForGetCourierConnections.java b/src/main/java/com/aftership/model/DataCourierConnectionResponseForGetCourierConnections.java new file mode 100644 index 0000000..be10331 --- /dev/null +++ b/src/main/java/com/aftership/model/DataCourierConnectionResponseForGetCourierConnections.java @@ -0,0 +1,34 @@ +/* + * This code was auto generated by AfterShip SDK Generator. + * Do not edit the class manually. + */ +package com.aftership.model; + +import com.aftership.base.Resource; +import com.google.gson.annotations.SerializedName; + +public class DataCourierConnectionResponseForGetCourierConnections extends Resource { + + @SerializedName("pagination") + private PaginationDataCourierConnectionResponseForGetCourierConnections pagination; + + @SerializedName("courier_connections") + private java.util.List courierConnections; + + public PaginationDataCourierConnectionResponseForGetCourierConnections getPagination() { + return pagination; + } + + public void setPagination( + PaginationDataCourierConnectionResponseForGetCourierConnections pagination) { + this.pagination = pagination; + } + + public java.util.List getCourierConnections() { + return courierConnections; + } + + public void setCourierConnections(java.util.List courierConnections) { + this.courierConnections = courierConnections; + } +} diff --git a/src/main/java/com/aftership/model/DataCourierResponseV1.java b/src/main/java/com/aftership/model/DataCourierResponse.java similarity index 92% rename from src/main/java/com/aftership/model/DataCourierResponseV1.java rename to src/main/java/com/aftership/model/DataCourierResponse.java index 1bad3e3..d926a76 100644 --- a/src/main/java/com/aftership/model/DataCourierResponseV1.java +++ b/src/main/java/com/aftership/model/DataCourierResponse.java @@ -7,7 +7,7 @@ import com.aftership.base.Resource; import com.google.gson.annotations.SerializedName; -public class DataCourierResponseV1 extends Resource { +public class DataCourierResponse extends Resource { @SerializedName("total") private Integer total; diff --git a/src/main/java/com/aftership/model/DataTrackingResponseGetMultipleV1.java b/src/main/java/com/aftership/model/DataTrackingResponseForGetTrackings.java similarity index 66% rename from src/main/java/com/aftership/model/DataTrackingResponseGetMultipleV1.java rename to src/main/java/com/aftership/model/DataTrackingResponseForGetTrackings.java index b222d4b..b4f2fc1 100644 --- a/src/main/java/com/aftership/model/DataTrackingResponseGetMultipleV1.java +++ b/src/main/java/com/aftership/model/DataTrackingResponseForGetTrackings.java @@ -7,19 +7,19 @@ import com.aftership.base.Resource; import com.google.gson.annotations.SerializedName; -public class DataTrackingResponseGetMultipleV1 extends Resource { +public class DataTrackingResponseForGetTrackings extends Resource { @SerializedName("pagination") - private PaginationDataTrackingResponseGetMultipleV1 pagination; + private PaginationDataTrackingResponseForGetTrackings pagination; @SerializedName("trackings") private java.util.List trackings; - public PaginationDataTrackingResponseGetMultipleV1 getPagination() { + public PaginationDataTrackingResponseForGetTrackings getPagination() { return pagination; } - public void setPagination(PaginationDataTrackingResponseGetMultipleV1 pagination) { + public void setPagination(PaginationDataTrackingResponseForGetTrackings pagination) { this.pagination = pagination; } diff --git a/src/main/java/com/aftership/model/DeleteCourierConnectionsByIdResponse.java b/src/main/java/com/aftership/model/DeleteCourierConnectionsByIdResponse.java new file mode 100644 index 0000000..fe2e61a --- /dev/null +++ b/src/main/java/com/aftership/model/DeleteCourierConnectionsByIdResponse.java @@ -0,0 +1,66 @@ +/* + * This code was auto generated by AfterShip SDK Generator. + * Do not edit the class manually. + */ +package com.aftership.model; + +import com.aftership.base.Resource; +import com.google.gson.annotations.SerializedName; + +public class DeleteCourierConnectionsByIdResponse extends Resource { + + @SerializedName("id") + private String id; + + @SerializedName("courier_slug") + private String courierSlug; + + @SerializedName("credentials") + private java.util.Map credentials; + + @SerializedName("created_at") + private String createdAt; + + @SerializedName("updated_at") + private String updatedAt; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCourierSlug() { + return courierSlug; + } + + public void setCourierSlug(String courierSlug) { + this.courierSlug = courierSlug; + } + + public java.util.Map getCredentials() { + return credentials; + } + + public void setCredentials(java.util.Map credentials) { + this.credentials = credentials; + } + + public String getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(String createdAt) { + this.createdAt = createdAt; + } + + public String getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(String updatedAt) { + this.updatedAt = updatedAt; + } +} diff --git a/src/main/java/com/aftership/model/DeleteTrackingByIdResponse.java b/src/main/java/com/aftership/model/DeleteTrackingByIdResponse.java index 918e36b..daeedc7 100644 --- a/src/main/java/com/aftership/model/DeleteTrackingByIdResponse.java +++ b/src/main/java/com/aftership/model/DeleteTrackingByIdResponse.java @@ -106,7 +106,7 @@ public class DeleteTrackingByIdResponse extends Resource { private String source; @SerializedName("tag") - private TagV1 tag; + private Tag tag; @SerializedName("subtag") private String subtag; @@ -201,18 +201,6 @@ public class DeleteTrackingByIdResponse extends Resource { @SerializedName("courier_connection_id") private String courierConnectionId; - @SerializedName("tracking_origin_country_region") - private String trackingOriginCountryRegion; - - @SerializedName("tracking_destination_country_region") - private String trackingDestinationCountryRegion; - - @SerializedName("tracking_postal_code") - private String trackingPostalCode; - - @SerializedName("tracking_state") - private String trackingState; - @SerializedName("carbon_emissions") private CarbonEmissionsDeleteTrackingByIdResponse carbonEmissions; @@ -503,11 +491,11 @@ public void setSource(String source) { this.source = source; } - public TagV1 getTag() { + public Tag getTag() { return tag; } - public void setTag(TagV1 tag) { + public void setTag(Tag tag) { this.tag = tag; } @@ -764,38 +752,6 @@ public void setCourierConnectionId(String courierConnectionId) { this.courierConnectionId = courierConnectionId; } - public String getTrackingOriginCountryRegion() { - return trackingOriginCountryRegion; - } - - public void setTrackingOriginCountryRegion(String trackingOriginCountryRegion) { - this.trackingOriginCountryRegion = trackingOriginCountryRegion; - } - - public String getTrackingDestinationCountryRegion() { - return trackingDestinationCountryRegion; - } - - public void setTrackingDestinationCountryRegion(String trackingDestinationCountryRegion) { - this.trackingDestinationCountryRegion = trackingDestinationCountryRegion; - } - - public String getTrackingPostalCode() { - return trackingPostalCode; - } - - public void setTrackingPostalCode(String trackingPostalCode) { - this.trackingPostalCode = trackingPostalCode; - } - - public String getTrackingState() { - return trackingState; - } - - public void setTrackingState(String trackingState) { - this.trackingState = trackingState; - } - public CarbonEmissionsDeleteTrackingByIdResponse getCarbonEmissions() { return carbonEmissions; } diff --git a/src/main/java/com/aftership/model/DetectCourierRequest.java b/src/main/java/com/aftership/model/DetectCourierRequest.java index bb99944..d76c7ba 100644 --- a/src/main/java/com/aftership/model/DetectCourierRequest.java +++ b/src/main/java/com/aftership/model/DetectCourierRequest.java @@ -15,8 +15,8 @@ public class DetectCourierRequest extends Resource { @SerializedName("slug") private java.util.List slug; - @SerializedName("tracking_postal_code") - private String trackingPostalCode; + @SerializedName("destination_postal_code") + private String destinationPostalCode; @SerializedName("tracking_ship_date") private String trackingShipDate; @@ -27,17 +27,11 @@ public class DetectCourierRequest extends Resource { @SerializedName("tracking_key") private String trackingKey; - @SerializedName("tracking_origin_country_region") - private String trackingOriginCountryRegion; - - @SerializedName("tracking_destination_country_region") - private String trackingDestinationCountryRegion; - - @SerializedName("tracking_state") - private String trackingState; + @SerializedName("destination_state") + private String destinationState; @SerializedName("slug_group") - private SlugGroupV1 slugGroup; + private SlugGroup slugGroup; @SerializedName("origin_country_region") private String originCountryRegion; @@ -61,12 +55,12 @@ public void setSlug(java.util.List slug) { this.slug = slug; } - public String getTrackingPostalCode() { - return trackingPostalCode; + public String getDestinationPostalCode() { + return destinationPostalCode; } - public void setTrackingPostalCode(String trackingPostalCode) { - this.trackingPostalCode = trackingPostalCode; + public void setDestinationPostalCode(String destinationPostalCode) { + this.destinationPostalCode = destinationPostalCode; } public String getTrackingShipDate() { @@ -93,35 +87,19 @@ public void setTrackingKey(String trackingKey) { this.trackingKey = trackingKey; } - public String getTrackingOriginCountryRegion() { - return trackingOriginCountryRegion; - } - - public void setTrackingOriginCountryRegion(String trackingOriginCountryRegion) { - this.trackingOriginCountryRegion = trackingOriginCountryRegion; - } - - public String getTrackingDestinationCountryRegion() { - return trackingDestinationCountryRegion; - } - - public void setTrackingDestinationCountryRegion(String trackingDestinationCountryRegion) { - this.trackingDestinationCountryRegion = trackingDestinationCountryRegion; - } - - public String getTrackingState() { - return trackingState; + public String getDestinationState() { + return destinationState; } - public void setTrackingState(String trackingState) { - this.trackingState = trackingState; + public void setDestinationState(String destinationState) { + this.destinationState = destinationState; } - public SlugGroupV1 getSlugGroup() { + public SlugGroup getSlugGroup() { return slugGroup; } - public void setSlugGroup(SlugGroupV1 slugGroup) { + public void setSlugGroup(SlugGroup slugGroup) { this.slugGroup = slugGroup; } diff --git a/src/main/java/com/aftership/model/FirstMileCreateTrackingResponse.java b/src/main/java/com/aftership/model/FirstMileCreateTrackingResponse.java index 6255ae9..a1dbf07 100644 --- a/src/main/java/com/aftership/model/FirstMileCreateTrackingResponse.java +++ b/src/main/java/com/aftership/model/FirstMileCreateTrackingResponse.java @@ -16,7 +16,7 @@ public class FirstMileCreateTrackingResponse extends Resource { private String slug; @SerializedName("transit_time") - private String transitTime; + private Integer transitTime; @SerializedName("courier_redirect_link") private String courierRedirectLink; @@ -40,11 +40,11 @@ public void setSlug(String slug) { this.slug = slug; } - public String getTransitTime() { + public Integer getTransitTime() { return transitTime; } - public void setTransitTime(String transitTime) { + public void setTransitTime(Integer transitTime) { this.transitTime = transitTime; } diff --git a/src/main/java/com/aftership/model/FirstMileDeleteTrackingByIdResponse.java b/src/main/java/com/aftership/model/FirstMileDeleteTrackingByIdResponse.java index 465611f..15d6039 100644 --- a/src/main/java/com/aftership/model/FirstMileDeleteTrackingByIdResponse.java +++ b/src/main/java/com/aftership/model/FirstMileDeleteTrackingByIdResponse.java @@ -16,7 +16,7 @@ public class FirstMileDeleteTrackingByIdResponse extends Resource { private String slug; @SerializedName("transit_time") - private String transitTime; + private Integer transitTime; @SerializedName("courier_redirect_link") private String courierRedirectLink; @@ -40,11 +40,11 @@ public void setSlug(String slug) { this.slug = slug; } - public String getTransitTime() { + public Integer getTransitTime() { return transitTime; } - public void setTransitTime(String transitTime) { + public void setTransitTime(Integer transitTime) { this.transitTime = transitTime; } diff --git a/src/main/java/com/aftership/model/FirstMileGetTrackingByIdResponse.java b/src/main/java/com/aftership/model/FirstMileGetTrackingByIdResponse.java index 189cbb3..4a32f31 100644 --- a/src/main/java/com/aftership/model/FirstMileGetTrackingByIdResponse.java +++ b/src/main/java/com/aftership/model/FirstMileGetTrackingByIdResponse.java @@ -16,7 +16,7 @@ public class FirstMileGetTrackingByIdResponse extends Resource { private String slug; @SerializedName("transit_time") - private String transitTime; + private Integer transitTime; @SerializedName("courier_redirect_link") private String courierRedirectLink; @@ -40,11 +40,11 @@ public void setSlug(String slug) { this.slug = slug; } - public String getTransitTime() { + public Integer getTransitTime() { return transitTime; } - public void setTransitTime(String transitTime) { + public void setTransitTime(Integer transitTime) { this.transitTime = transitTime; } diff --git a/src/main/java/com/aftership/model/FirstMileMarkTrackingCompletedByIdResponse.java b/src/main/java/com/aftership/model/FirstMileMarkTrackingCompletedByIdResponse.java index 9b13532..f358a79 100644 --- a/src/main/java/com/aftership/model/FirstMileMarkTrackingCompletedByIdResponse.java +++ b/src/main/java/com/aftership/model/FirstMileMarkTrackingCompletedByIdResponse.java @@ -16,7 +16,7 @@ public class FirstMileMarkTrackingCompletedByIdResponse extends Resource { private String slug; @SerializedName("transit_time") - private String transitTime; + private Integer transitTime; @SerializedName("courier_redirect_link") private String courierRedirectLink; @@ -40,11 +40,11 @@ public void setSlug(String slug) { this.slug = slug; } - public String getTransitTime() { + public Integer getTransitTime() { return transitTime; } - public void setTransitTime(String transitTime) { + public void setTransitTime(Integer transitTime) { this.transitTime = transitTime; } diff --git a/src/main/java/com/aftership/model/FirstMileRetrackTrackingByIdResponse.java b/src/main/java/com/aftership/model/FirstMileRetrackTrackingByIdResponse.java index 14d3ea6..cfe36be 100644 --- a/src/main/java/com/aftership/model/FirstMileRetrackTrackingByIdResponse.java +++ b/src/main/java/com/aftership/model/FirstMileRetrackTrackingByIdResponse.java @@ -16,7 +16,7 @@ public class FirstMileRetrackTrackingByIdResponse extends Resource { private String slug; @SerializedName("transit_time") - private String transitTime; + private Integer transitTime; @SerializedName("courier_redirect_link") private String courierRedirectLink; @@ -40,11 +40,11 @@ public void setSlug(String slug) { this.slug = slug; } - public String getTransitTime() { + public Integer getTransitTime() { return transitTime; } - public void setTransitTime(String transitTime) { + public void setTransitTime(Integer transitTime) { this.transitTime = transitTime; } diff --git a/src/main/java/com/aftership/model/FirstMileTracking.java b/src/main/java/com/aftership/model/FirstMileTracking.java index 1a4b521..6ec4149 100644 --- a/src/main/java/com/aftership/model/FirstMileTracking.java +++ b/src/main/java/com/aftership/model/FirstMileTracking.java @@ -16,7 +16,7 @@ public class FirstMileTracking extends Resource { private String slug; @SerializedName("transit_time") - private String transitTime; + private Integer transitTime; @SerializedName("courier_redirect_link") private String courierRedirectLink; @@ -40,11 +40,11 @@ public void setSlug(String slug) { this.slug = slug; } - public String getTransitTime() { + public Integer getTransitTime() { return transitTime; } - public void setTransitTime(String transitTime) { + public void setTransitTime(Integer transitTime) { this.transitTime = transitTime; } diff --git a/src/main/java/com/aftership/model/FirstMileUpdateTrackingByIdResponse.java b/src/main/java/com/aftership/model/FirstMileUpdateTrackingByIdResponse.java index fed3c5c..8f8e699 100644 --- a/src/main/java/com/aftership/model/FirstMileUpdateTrackingByIdResponse.java +++ b/src/main/java/com/aftership/model/FirstMileUpdateTrackingByIdResponse.java @@ -16,7 +16,7 @@ public class FirstMileUpdateTrackingByIdResponse extends Resource { private String slug; @SerializedName("transit_time") - private String transitTime; + private Integer transitTime; @SerializedName("courier_redirect_link") private String courierRedirectLink; @@ -40,11 +40,11 @@ public void setSlug(String slug) { this.slug = slug; } - public String getTransitTime() { + public Integer getTransitTime() { return transitTime; } - public void setTransitTime(String transitTime) { + public void setTransitTime(Integer transitTime) { this.transitTime = transitTime; } diff --git a/src/main/java/com/aftership/model/GetCourierConnectionsByIdResponse.java b/src/main/java/com/aftership/model/GetCourierConnectionsByIdResponse.java new file mode 100644 index 0000000..6360105 --- /dev/null +++ b/src/main/java/com/aftership/model/GetCourierConnectionsByIdResponse.java @@ -0,0 +1,66 @@ +/* + * This code was auto generated by AfterShip SDK Generator. + * Do not edit the class manually. + */ +package com.aftership.model; + +import com.aftership.base.Resource; +import com.google.gson.annotations.SerializedName; + +public class GetCourierConnectionsByIdResponse extends Resource { + + @SerializedName("id") + private String id; + + @SerializedName("courier_slug") + private String courierSlug; + + @SerializedName("credentials") + private java.util.Map credentials; + + @SerializedName("created_at") + private String createdAt; + + @SerializedName("updated_at") + private String updatedAt; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCourierSlug() { + return courierSlug; + } + + public void setCourierSlug(String courierSlug) { + this.courierSlug = courierSlug; + } + + public java.util.Map getCredentials() { + return credentials; + } + + public void setCredentials(java.util.Map credentials) { + this.credentials = credentials; + } + + public String getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(String createdAt) { + this.createdAt = createdAt; + } + + public String getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(String updatedAt) { + this.updatedAt = updatedAt; + } +} diff --git a/src/main/java/com/aftership/model/GetCourierConnectionsResponse.java b/src/main/java/com/aftership/model/GetCourierConnectionsResponse.java new file mode 100644 index 0000000..501fcba --- /dev/null +++ b/src/main/java/com/aftership/model/GetCourierConnectionsResponse.java @@ -0,0 +1,33 @@ +/* + * This code was auto generated by AfterShip SDK Generator. + * Do not edit the class manually. + */ +package com.aftership.model; + +import com.aftership.base.Resource; +import com.google.gson.annotations.SerializedName; + +public class GetCourierConnectionsResponse extends Resource { + + @SerializedName("pagination") + private PaginationGetCourierConnectionsResponse pagination; + + @SerializedName("courier_connections") + private java.util.List courierConnections; + + public PaginationGetCourierConnectionsResponse getPagination() { + return pagination; + } + + public void setPagination(PaginationGetCourierConnectionsResponse pagination) { + this.pagination = pagination; + } + + public java.util.List getCourierConnections() { + return courierConnections; + } + + public void setCourierConnections(java.util.List courierConnections) { + this.courierConnections = courierConnections; + } +} diff --git a/src/main/java/com/aftership/model/GetAllCouriersResponse.java b/src/main/java/com/aftership/model/GetCouriersResponse.java similarity index 92% rename from src/main/java/com/aftership/model/GetAllCouriersResponse.java rename to src/main/java/com/aftership/model/GetCouriersResponse.java index 495396b..9e61c3b 100644 --- a/src/main/java/com/aftership/model/GetAllCouriersResponse.java +++ b/src/main/java/com/aftership/model/GetCouriersResponse.java @@ -7,7 +7,7 @@ import com.aftership.base.Resource; import com.google.gson.annotations.SerializedName; -public class GetAllCouriersResponse extends Resource { +public class GetCouriersResponse extends Resource { @SerializedName("total") private Integer total; diff --git a/src/main/java/com/aftership/model/GetTrackingByIdResponse.java b/src/main/java/com/aftership/model/GetTrackingByIdResponse.java index 14d48f8..d986844 100644 --- a/src/main/java/com/aftership/model/GetTrackingByIdResponse.java +++ b/src/main/java/com/aftership/model/GetTrackingByIdResponse.java @@ -106,7 +106,7 @@ public class GetTrackingByIdResponse extends Resource { private String source; @SerializedName("tag") - private TagV1 tag; + private Tag tag; @SerializedName("subtag") private String subtag; @@ -201,18 +201,6 @@ public class GetTrackingByIdResponse extends Resource { @SerializedName("courier_connection_id") private String courierConnectionId; - @SerializedName("tracking_origin_country_region") - private String trackingOriginCountryRegion; - - @SerializedName("tracking_destination_country_region") - private String trackingDestinationCountryRegion; - - @SerializedName("tracking_postal_code") - private String trackingPostalCode; - - @SerializedName("tracking_state") - private String trackingState; - @SerializedName("carbon_emissions") private CarbonEmissionsGetTrackingByIdResponse carbonEmissions; @@ -503,11 +491,11 @@ public void setSource(String source) { this.source = source; } - public TagV1 getTag() { + public Tag getTag() { return tag; } - public void setTag(TagV1 tag) { + public void setTag(Tag tag) { this.tag = tag; } @@ -763,38 +751,6 @@ public void setCourierConnectionId(String courierConnectionId) { this.courierConnectionId = courierConnectionId; } - public String getTrackingOriginCountryRegion() { - return trackingOriginCountryRegion; - } - - public void setTrackingOriginCountryRegion(String trackingOriginCountryRegion) { - this.trackingOriginCountryRegion = trackingOriginCountryRegion; - } - - public String getTrackingDestinationCountryRegion() { - return trackingDestinationCountryRegion; - } - - public void setTrackingDestinationCountryRegion(String trackingDestinationCountryRegion) { - this.trackingDestinationCountryRegion = trackingDestinationCountryRegion; - } - - public String getTrackingPostalCode() { - return trackingPostalCode; - } - - public void setTrackingPostalCode(String trackingPostalCode) { - this.trackingPostalCode = trackingPostalCode; - } - - public String getTrackingState() { - return trackingState; - } - - public void setTrackingState(String trackingState) { - this.trackingState = trackingState; - } - public CarbonEmissionsGetTrackingByIdResponse getCarbonEmissions() { return carbonEmissions; } diff --git a/src/main/java/com/aftership/model/GetUserCouriersResponse.java b/src/main/java/com/aftership/model/GetUserCouriersResponse.java deleted file mode 100644 index b9c2292..0000000 --- a/src/main/java/com/aftership/model/GetUserCouriersResponse.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * This code was auto generated by AfterShip SDK Generator. - * Do not edit the class manually. - */ -package com.aftership.model; - -import com.aftership.base.Resource; -import com.google.gson.annotations.SerializedName; - -public class GetUserCouriersResponse extends Resource { - - @SerializedName("total") - private Integer total; - - @SerializedName("couriers") - private java.util.List couriers; - - public Integer getTotal() { - return total; - } - - public void setTotal(Integer total) { - this.total = total; - } - - public java.util.List getCouriers() { - return couriers; - } - - public void setCouriers(java.util.List couriers) { - this.couriers = couriers; - } -} diff --git a/src/main/java/com/aftership/model/LastMileCreateTrackingResponse.java b/src/main/java/com/aftership/model/LastMileCreateTrackingResponse.java index 62616dd..b4e05b9 100644 --- a/src/main/java/com/aftership/model/LastMileCreateTrackingResponse.java +++ b/src/main/java/com/aftership/model/LastMileCreateTrackingResponse.java @@ -16,7 +16,7 @@ public class LastMileCreateTrackingResponse extends Resource { private String slug; @SerializedName("transit_time") - private String transitTime; + private Integer transitTime; @SerializedName("courier_tracking_link") private String courierTrackingLink; @@ -43,11 +43,11 @@ public void setSlug(String slug) { this.slug = slug; } - public String getTransitTime() { + public Integer getTransitTime() { return transitTime; } - public void setTransitTime(String transitTime) { + public void setTransitTime(Integer transitTime) { this.transitTime = transitTime; } diff --git a/src/main/java/com/aftership/model/LastMileDeleteTrackingByIdResponse.java b/src/main/java/com/aftership/model/LastMileDeleteTrackingByIdResponse.java index 999288c..6a34438 100644 --- a/src/main/java/com/aftership/model/LastMileDeleteTrackingByIdResponse.java +++ b/src/main/java/com/aftership/model/LastMileDeleteTrackingByIdResponse.java @@ -16,7 +16,7 @@ public class LastMileDeleteTrackingByIdResponse extends Resource { private String slug; @SerializedName("transit_time") - private String transitTime; + private Integer transitTime; @SerializedName("courier_tracking_link") private String courierTrackingLink; @@ -43,11 +43,11 @@ public void setSlug(String slug) { this.slug = slug; } - public String getTransitTime() { + public Integer getTransitTime() { return transitTime; } - public void setTransitTime(String transitTime) { + public void setTransitTime(Integer transitTime) { this.transitTime = transitTime; } diff --git a/src/main/java/com/aftership/model/LastMileGetTrackingByIdResponse.java b/src/main/java/com/aftership/model/LastMileGetTrackingByIdResponse.java index c983d0b..11b9e85 100644 --- a/src/main/java/com/aftership/model/LastMileGetTrackingByIdResponse.java +++ b/src/main/java/com/aftership/model/LastMileGetTrackingByIdResponse.java @@ -16,7 +16,7 @@ public class LastMileGetTrackingByIdResponse extends Resource { private String slug; @SerializedName("transit_time") - private String transitTime; + private Integer transitTime; @SerializedName("courier_tracking_link") private String courierTrackingLink; @@ -43,11 +43,11 @@ public void setSlug(String slug) { this.slug = slug; } - public String getTransitTime() { + public Integer getTransitTime() { return transitTime; } - public void setTransitTime(String transitTime) { + public void setTransitTime(Integer transitTime) { this.transitTime = transitTime; } diff --git a/src/main/java/com/aftership/model/LastMileMarkTrackingCompletedByIdResponse.java b/src/main/java/com/aftership/model/LastMileMarkTrackingCompletedByIdResponse.java index a4137c1..f9223e0 100644 --- a/src/main/java/com/aftership/model/LastMileMarkTrackingCompletedByIdResponse.java +++ b/src/main/java/com/aftership/model/LastMileMarkTrackingCompletedByIdResponse.java @@ -16,7 +16,7 @@ public class LastMileMarkTrackingCompletedByIdResponse extends Resource { private String slug; @SerializedName("transit_time") - private String transitTime; + private Integer transitTime; @SerializedName("courier_tracking_link") private String courierTrackingLink; @@ -43,11 +43,11 @@ public void setSlug(String slug) { this.slug = slug; } - public String getTransitTime() { + public Integer getTransitTime() { return transitTime; } - public void setTransitTime(String transitTime) { + public void setTransitTime(Integer transitTime) { this.transitTime = transitTime; } diff --git a/src/main/java/com/aftership/model/LastMileRetrackTrackingByIdResponse.java b/src/main/java/com/aftership/model/LastMileRetrackTrackingByIdResponse.java index 1073553..44e99da 100644 --- a/src/main/java/com/aftership/model/LastMileRetrackTrackingByIdResponse.java +++ b/src/main/java/com/aftership/model/LastMileRetrackTrackingByIdResponse.java @@ -16,7 +16,7 @@ public class LastMileRetrackTrackingByIdResponse extends Resource { private String slug; @SerializedName("transit_time") - private String transitTime; + private Integer transitTime; @SerializedName("courier_tracking_link") private String courierTrackingLink; @@ -43,11 +43,11 @@ public void setSlug(String slug) { this.slug = slug; } - public String getTransitTime() { + public Integer getTransitTime() { return transitTime; } - public void setTransitTime(String transitTime) { + public void setTransitTime(Integer transitTime) { this.transitTime = transitTime; } diff --git a/src/main/java/com/aftership/model/LastMileTracking.java b/src/main/java/com/aftership/model/LastMileTracking.java index fb2e466..542d35e 100644 --- a/src/main/java/com/aftership/model/LastMileTracking.java +++ b/src/main/java/com/aftership/model/LastMileTracking.java @@ -16,7 +16,7 @@ public class LastMileTracking extends Resource { private String slug; @SerializedName("transit_time") - private String transitTime; + private Integer transitTime; @SerializedName("courier_tracking_link") private String courierTrackingLink; @@ -43,11 +43,11 @@ public void setSlug(String slug) { this.slug = slug; } - public String getTransitTime() { + public Integer getTransitTime() { return transitTime; } - public void setTransitTime(String transitTime) { + public void setTransitTime(Integer transitTime) { this.transitTime = transitTime; } diff --git a/src/main/java/com/aftership/model/LastMileUpdateTrackingByIdResponse.java b/src/main/java/com/aftership/model/LastMileUpdateTrackingByIdResponse.java index 4fcb542..a32b1b6 100644 --- a/src/main/java/com/aftership/model/LastMileUpdateTrackingByIdResponse.java +++ b/src/main/java/com/aftership/model/LastMileUpdateTrackingByIdResponse.java @@ -16,7 +16,7 @@ public class LastMileUpdateTrackingByIdResponse extends Resource { private String slug; @SerializedName("transit_time") - private String transitTime; + private Integer transitTime; @SerializedName("courier_tracking_link") private String courierTrackingLink; @@ -43,11 +43,11 @@ public void setSlug(String slug) { this.slug = slug; } - public String getTransitTime() { + public Integer getTransitTime() { return transitTime; } - public void setTransitTime(String transitTime) { + public void setTransitTime(Integer transitTime) { this.transitTime = transitTime; } diff --git a/src/main/java/com/aftership/model/LatestEstimatedDeliveryCreateTrackingResponse.java b/src/main/java/com/aftership/model/LatestEstimatedDeliveryCreateTrackingResponse.java index e6446b8..5cb877d 100644 --- a/src/main/java/com/aftership/model/LatestEstimatedDeliveryCreateTrackingResponse.java +++ b/src/main/java/com/aftership/model/LatestEstimatedDeliveryCreateTrackingResponse.java @@ -24,6 +24,9 @@ public class LatestEstimatedDeliveryCreateTrackingResponse extends Resource { @SerializedName("datetime_max") private String datetimeMax; + @SerializedName("revise_reason") + private String reviseReason; + public String getType() { return type; } @@ -63,4 +66,12 @@ public String getDatetimeMax() { public void setDatetimeMax(String datetimeMax) { this.datetimeMax = datetimeMax; } + + public String getReviseReason() { + return reviseReason; + } + + public void setReviseReason(String reviseReason) { + this.reviseReason = reviseReason; + } } diff --git a/src/main/java/com/aftership/model/LatestEstimatedDeliveryDeleteTrackingByIdResponse.java b/src/main/java/com/aftership/model/LatestEstimatedDeliveryDeleteTrackingByIdResponse.java index 5c07ea9..79070b7 100644 --- a/src/main/java/com/aftership/model/LatestEstimatedDeliveryDeleteTrackingByIdResponse.java +++ b/src/main/java/com/aftership/model/LatestEstimatedDeliveryDeleteTrackingByIdResponse.java @@ -24,6 +24,9 @@ public class LatestEstimatedDeliveryDeleteTrackingByIdResponse extends Resource @SerializedName("datetime_max") private String datetimeMax; + @SerializedName("revise_reason") + private String reviseReason; + public String getType() { return type; } @@ -63,4 +66,12 @@ public String getDatetimeMax() { public void setDatetimeMax(String datetimeMax) { this.datetimeMax = datetimeMax; } + + public String getReviseReason() { + return reviseReason; + } + + public void setReviseReason(String reviseReason) { + this.reviseReason = reviseReason; + } } diff --git a/src/main/java/com/aftership/model/LatestEstimatedDeliveryGetTrackingByIdResponse.java b/src/main/java/com/aftership/model/LatestEstimatedDeliveryGetTrackingByIdResponse.java index 535b60b..550793c 100644 --- a/src/main/java/com/aftership/model/LatestEstimatedDeliveryGetTrackingByIdResponse.java +++ b/src/main/java/com/aftership/model/LatestEstimatedDeliveryGetTrackingByIdResponse.java @@ -24,6 +24,9 @@ public class LatestEstimatedDeliveryGetTrackingByIdResponse extends Resource { @SerializedName("datetime_max") private String datetimeMax; + @SerializedName("revise_reason") + private String reviseReason; + public String getType() { return type; } @@ -63,4 +66,12 @@ public String getDatetimeMax() { public void setDatetimeMax(String datetimeMax) { this.datetimeMax = datetimeMax; } + + public String getReviseReason() { + return reviseReason; + } + + public void setReviseReason(String reviseReason) { + this.reviseReason = reviseReason; + } } diff --git a/src/main/java/com/aftership/model/LatestEstimatedDeliveryMarkTrackingCompletedByIdResponse.java b/src/main/java/com/aftership/model/LatestEstimatedDeliveryMarkTrackingCompletedByIdResponse.java index 857eb8c..930f031 100644 --- a/src/main/java/com/aftership/model/LatestEstimatedDeliveryMarkTrackingCompletedByIdResponse.java +++ b/src/main/java/com/aftership/model/LatestEstimatedDeliveryMarkTrackingCompletedByIdResponse.java @@ -24,6 +24,9 @@ public class LatestEstimatedDeliveryMarkTrackingCompletedByIdResponse extends Re @SerializedName("datetime_max") private String datetimeMax; + @SerializedName("revise_reason") + private String reviseReason; + public String getType() { return type; } @@ -63,4 +66,12 @@ public String getDatetimeMax() { public void setDatetimeMax(String datetimeMax) { this.datetimeMax = datetimeMax; } + + public String getReviseReason() { + return reviseReason; + } + + public void setReviseReason(String reviseReason) { + this.reviseReason = reviseReason; + } } diff --git a/src/main/java/com/aftership/model/LatestEstimatedDeliveryRetrackTrackingByIdResponse.java b/src/main/java/com/aftership/model/LatestEstimatedDeliveryRetrackTrackingByIdResponse.java index e3534ea..64e47ee 100644 --- a/src/main/java/com/aftership/model/LatestEstimatedDeliveryRetrackTrackingByIdResponse.java +++ b/src/main/java/com/aftership/model/LatestEstimatedDeliveryRetrackTrackingByIdResponse.java @@ -24,6 +24,9 @@ public class LatestEstimatedDeliveryRetrackTrackingByIdResponse extends Resource @SerializedName("datetime_max") private String datetimeMax; + @SerializedName("revise_reason") + private String reviseReason; + public String getType() { return type; } @@ -63,4 +66,12 @@ public String getDatetimeMax() { public void setDatetimeMax(String datetimeMax) { this.datetimeMax = datetimeMax; } + + public String getReviseReason() { + return reviseReason; + } + + public void setReviseReason(String reviseReason) { + this.reviseReason = reviseReason; + } } diff --git a/src/main/java/com/aftership/model/LatestEstimatedDeliveryTracking.java b/src/main/java/com/aftership/model/LatestEstimatedDeliveryTracking.java index 0427a94..8f36b0f 100644 --- a/src/main/java/com/aftership/model/LatestEstimatedDeliveryTracking.java +++ b/src/main/java/com/aftership/model/LatestEstimatedDeliveryTracking.java @@ -24,6 +24,9 @@ public class LatestEstimatedDeliveryTracking extends Resource { @SerializedName("datetime_max") private String datetimeMax; + @SerializedName("revise_reason") + private String reviseReason; + public String getType() { return type; } @@ -63,4 +66,12 @@ public String getDatetimeMax() { public void setDatetimeMax(String datetimeMax) { this.datetimeMax = datetimeMax; } + + public String getReviseReason() { + return reviseReason; + } + + public void setReviseReason(String reviseReason) { + this.reviseReason = reviseReason; + } } diff --git a/src/main/java/com/aftership/model/LatestEstimatedDeliveryUpdateTrackingByIdResponse.java b/src/main/java/com/aftership/model/LatestEstimatedDeliveryUpdateTrackingByIdResponse.java index 1960667..019af74 100644 --- a/src/main/java/com/aftership/model/LatestEstimatedDeliveryUpdateTrackingByIdResponse.java +++ b/src/main/java/com/aftership/model/LatestEstimatedDeliveryUpdateTrackingByIdResponse.java @@ -24,6 +24,9 @@ public class LatestEstimatedDeliveryUpdateTrackingByIdResponse extends Resource @SerializedName("datetime_max") private String datetimeMax; + @SerializedName("revise_reason") + private String reviseReason; + public String getType() { return type; } @@ -63,4 +66,12 @@ public String getDatetimeMax() { public void setDatetimeMax(String datetimeMax) { this.datetimeMax = datetimeMax; } + + public String getReviseReason() { + return reviseReason; + } + + public void setReviseReason(String reviseReason) { + this.reviseReason = reviseReason; + } } diff --git a/src/main/java/com/aftership/model/MarkTrackingCompletedByIdRequest.java b/src/main/java/com/aftership/model/MarkTrackingCompletedByIdRequest.java index fd07a33..20bbd00 100644 --- a/src/main/java/com/aftership/model/MarkTrackingCompletedByIdRequest.java +++ b/src/main/java/com/aftership/model/MarkTrackingCompletedByIdRequest.java @@ -12,6 +12,9 @@ public class MarkTrackingCompletedByIdRequest extends Resource { @SerializedName("reason") private String reason; + @SerializedName("event_datetime") + private String eventDatetime; + public String getReason() { return reason; } @@ -19,4 +22,12 @@ public String getReason() { public void setReason(String reason) { this.reason = reason; } + + public String getEventDatetime() { + return eventDatetime; + } + + public void setEventDatetime(String eventDatetime) { + this.eventDatetime = eventDatetime; + } } diff --git a/src/main/java/com/aftership/model/MarkTrackingCompletedByIdResponse.java b/src/main/java/com/aftership/model/MarkTrackingCompletedByIdResponse.java index ab7ec74..8824cd9 100644 --- a/src/main/java/com/aftership/model/MarkTrackingCompletedByIdResponse.java +++ b/src/main/java/com/aftership/model/MarkTrackingCompletedByIdResponse.java @@ -107,7 +107,7 @@ public class MarkTrackingCompletedByIdResponse extends Resource { private String source; @SerializedName("tag") - private TagV1 tag; + private Tag tag; @SerializedName("subtag") private String subtag; @@ -203,18 +203,6 @@ public class MarkTrackingCompletedByIdResponse extends Resource { @SerializedName("courier_connection_id") private String courierConnectionId; - @SerializedName("tracking_origin_country_region") - private String trackingOriginCountryRegion; - - @SerializedName("tracking_destination_country_region") - private String trackingDestinationCountryRegion; - - @SerializedName("tracking_postal_code") - private String trackingPostalCode; - - @SerializedName("tracking_state") - private String trackingState; - @SerializedName("carbon_emissions") private CarbonEmissionsMarkTrackingCompletedByIdResponse carbonEmissions; @@ -506,11 +494,11 @@ public void setSource(String source) { this.source = source; } - public TagV1 getTag() { + public Tag getTag() { return tag; } - public void setTag(TagV1 tag) { + public void setTag(Tag tag) { this.tag = tag; } @@ -769,38 +757,6 @@ public void setCourierConnectionId(String courierConnectionId) { this.courierConnectionId = courierConnectionId; } - public String getTrackingOriginCountryRegion() { - return trackingOriginCountryRegion; - } - - public void setTrackingOriginCountryRegion(String trackingOriginCountryRegion) { - this.trackingOriginCountryRegion = trackingOriginCountryRegion; - } - - public String getTrackingDestinationCountryRegion() { - return trackingDestinationCountryRegion; - } - - public void setTrackingDestinationCountryRegion(String trackingDestinationCountryRegion) { - this.trackingDestinationCountryRegion = trackingDestinationCountryRegion; - } - - public String getTrackingPostalCode() { - return trackingPostalCode; - } - - public void setTrackingPostalCode(String trackingPostalCode) { - this.trackingPostalCode = trackingPostalCode; - } - - public String getTrackingState() { - return trackingState; - } - - public void setTrackingState(String trackingState) { - this.trackingState = trackingState; - } - public CarbonEmissionsMarkTrackingCompletedByIdResponse getCarbonEmissions() { return carbonEmissions; } diff --git a/src/main/java/com/aftership/model/MetaV1.java b/src/main/java/com/aftership/model/Meta.java similarity index 95% rename from src/main/java/com/aftership/model/MetaV1.java rename to src/main/java/com/aftership/model/Meta.java index 8a4a369..e611bbf 100644 --- a/src/main/java/com/aftership/model/MetaV1.java +++ b/src/main/java/com/aftership/model/Meta.java @@ -7,7 +7,7 @@ import com.aftership.base.Resource; import com.google.gson.annotations.SerializedName; -public class MetaV1 extends Resource { +public class Meta extends Resource { @SerializedName("code") private Integer code; diff --git a/src/main/java/com/aftership/model/PaginationDataCourierConnectionResponseForGetCourierConnections.java b/src/main/java/com/aftership/model/PaginationDataCourierConnectionResponseForGetCourierConnections.java new file mode 100644 index 0000000..77185b5 --- /dev/null +++ b/src/main/java/com/aftership/model/PaginationDataCourierConnectionResponseForGetCourierConnections.java @@ -0,0 +1,44 @@ +/* + * This code was auto generated by AfterShip SDK Generator. + * Do not edit the class manually. + */ +package com.aftership.model; + +import com.aftership.base.Resource; +import com.google.gson.annotations.SerializedName; + +public class PaginationDataCourierConnectionResponseForGetCourierConnections extends Resource { + + @SerializedName("total") + private Integer total; + + @SerializedName("next_cursor") + private String nextCursor; + + @SerializedName("has_next_page") + private Boolean hasNextPage; + + public Integer getTotal() { + return total; + } + + public void setTotal(Integer total) { + this.total = total; + } + + public String getNextCursor() { + return nextCursor; + } + + public void setNextCursor(String nextCursor) { + this.nextCursor = nextCursor; + } + + public Boolean getHasNextPage() { + return hasNextPage; + } + + public void setHasNextPage(Boolean hasNextPage) { + this.hasNextPage = hasNextPage; + } +} diff --git a/src/main/java/com/aftership/model/PaginationDataTrackingResponseForGetTrackings.java b/src/main/java/com/aftership/model/PaginationDataTrackingResponseForGetTrackings.java new file mode 100644 index 0000000..5b60e2f --- /dev/null +++ b/src/main/java/com/aftership/model/PaginationDataTrackingResponseForGetTrackings.java @@ -0,0 +1,44 @@ +/* + * This code was auto generated by AfterShip SDK Generator. + * Do not edit the class manually. + */ +package com.aftership.model; + +import com.aftership.base.Resource; +import com.google.gson.annotations.SerializedName; + +public class PaginationDataTrackingResponseForGetTrackings extends Resource { + + @SerializedName("total") + private Integer total; + + @SerializedName("next_cursor") + private String nextCursor; + + @SerializedName("has_next_page") + private Boolean hasNextPage; + + public Integer getTotal() { + return total; + } + + public void setTotal(Integer total) { + this.total = total; + } + + public String getNextCursor() { + return nextCursor; + } + + public void setNextCursor(String nextCursor) { + this.nextCursor = nextCursor; + } + + public Boolean getHasNextPage() { + return hasNextPage; + } + + public void setHasNextPage(Boolean hasNextPage) { + this.hasNextPage = hasNextPage; + } +} diff --git a/src/main/java/com/aftership/model/PaginationDataTrackingResponseGetMultipleV1.java b/src/main/java/com/aftership/model/PaginationGetCourierConnectionsResponse.java similarity index 91% rename from src/main/java/com/aftership/model/PaginationDataTrackingResponseGetMultipleV1.java rename to src/main/java/com/aftership/model/PaginationGetCourierConnectionsResponse.java index b9fb1cb..cd2f516 100644 --- a/src/main/java/com/aftership/model/PaginationDataTrackingResponseGetMultipleV1.java +++ b/src/main/java/com/aftership/model/PaginationGetCourierConnectionsResponse.java @@ -7,7 +7,7 @@ import com.aftership.base.Resource; import com.google.gson.annotations.SerializedName; -public class PaginationDataTrackingResponseGetMultipleV1 extends Resource { +public class PaginationGetCourierConnectionsResponse extends Resource { @SerializedName("total") private Integer total; diff --git a/src/main/java/com/aftership/model/PostCourierConnectionsRequest.java b/src/main/java/com/aftership/model/PostCourierConnectionsRequest.java new file mode 100644 index 0000000..e7e11bb --- /dev/null +++ b/src/main/java/com/aftership/model/PostCourierConnectionsRequest.java @@ -0,0 +1,33 @@ +/* + * This code was auto generated by AfterShip SDK Generator. + * Do not edit the class manually. + */ +package com.aftership.model; + +import com.aftership.base.Resource; +import com.google.gson.annotations.SerializedName; + +public class PostCourierConnectionsRequest extends Resource { + + @SerializedName("courier_slug") + private String courierSlug; + + @SerializedName("credentials") + private java.util.Map credentials; + + public String getCourierSlug() { + return courierSlug; + } + + public void setCourierSlug(String courierSlug) { + this.courierSlug = courierSlug; + } + + public java.util.Map getCredentials() { + return credentials; + } + + public void setCredentials(java.util.Map credentials) { + this.credentials = credentials; + } +} diff --git a/src/main/java/com/aftership/model/PostCourierConnectionsResponse.java b/src/main/java/com/aftership/model/PostCourierConnectionsResponse.java new file mode 100644 index 0000000..cb4780d --- /dev/null +++ b/src/main/java/com/aftership/model/PostCourierConnectionsResponse.java @@ -0,0 +1,66 @@ +/* + * This code was auto generated by AfterShip SDK Generator. + * Do not edit the class manually. + */ +package com.aftership.model; + +import com.aftership.base.Resource; +import com.google.gson.annotations.SerializedName; + +public class PostCourierConnectionsResponse extends Resource { + + @SerializedName("id") + private String id; + + @SerializedName("courier_slug") + private String courierSlug; + + @SerializedName("credentials") + private java.util.Map credentials; + + @SerializedName("created_at") + private String createdAt; + + @SerializedName("updated_at") + private String updatedAt; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCourierSlug() { + return courierSlug; + } + + public void setCourierSlug(String courierSlug) { + this.courierSlug = courierSlug; + } + + public java.util.Map getCredentials() { + return credentials; + } + + public void setCredentials(java.util.Map credentials) { + this.credentials = credentials; + } + + public String getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(String createdAt) { + this.createdAt = createdAt; + } + + public String getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(String updatedAt) { + this.updatedAt = updatedAt; + } +} diff --git a/src/main/java/com/aftership/model/PutCourierConnectionsByIdRequest.java b/src/main/java/com/aftership/model/PutCourierConnectionsByIdRequest.java new file mode 100644 index 0000000..07deb47 --- /dev/null +++ b/src/main/java/com/aftership/model/PutCourierConnectionsByIdRequest.java @@ -0,0 +1,22 @@ +/* + * This code was auto generated by AfterShip SDK Generator. + * Do not edit the class manually. + */ +package com.aftership.model; + +import com.aftership.base.Resource; +import com.google.gson.annotations.SerializedName; + +public class PutCourierConnectionsByIdRequest extends Resource { + + @SerializedName("credentials") + private java.util.Map credentials; + + public java.util.Map getCredentials() { + return credentials; + } + + public void setCredentials(java.util.Map credentials) { + this.credentials = credentials; + } +} diff --git a/src/main/java/com/aftership/model/PutCourierConnectionsByIdResponse.java b/src/main/java/com/aftership/model/PutCourierConnectionsByIdResponse.java new file mode 100644 index 0000000..8ba4eeb --- /dev/null +++ b/src/main/java/com/aftership/model/PutCourierConnectionsByIdResponse.java @@ -0,0 +1,66 @@ +/* + * This code was auto generated by AfterShip SDK Generator. + * Do not edit the class manually. + */ +package com.aftership.model; + +import com.aftership.base.Resource; +import com.google.gson.annotations.SerializedName; + +public class PutCourierConnectionsByIdResponse extends Resource { + + @SerializedName("id") + private String id; + + @SerializedName("courier_slug") + private String courierSlug; + + @SerializedName("credentials") + private java.util.Map credentials; + + @SerializedName("created_at") + private String createdAt; + + @SerializedName("updated_at") + private String updatedAt; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCourierSlug() { + return courierSlug; + } + + public void setCourierSlug(String courierSlug) { + this.courierSlug = courierSlug; + } + + public java.util.Map getCredentials() { + return credentials; + } + + public void setCredentials(java.util.Map credentials) { + this.credentials = credentials; + } + + public String getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(String createdAt) { + this.createdAt = createdAt; + } + + public String getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(String updatedAt) { + this.updatedAt = updatedAt; + } +} diff --git a/src/main/java/com/aftership/model/RetrackTrackingByIdResponse.java b/src/main/java/com/aftership/model/RetrackTrackingByIdResponse.java index 6e7cdeb..d88bba2 100644 --- a/src/main/java/com/aftership/model/RetrackTrackingByIdResponse.java +++ b/src/main/java/com/aftership/model/RetrackTrackingByIdResponse.java @@ -106,7 +106,7 @@ public class RetrackTrackingByIdResponse extends Resource { private String source; @SerializedName("tag") - private TagV1 tag; + private Tag tag; @SerializedName("subtag") private String subtag; @@ -201,18 +201,6 @@ public class RetrackTrackingByIdResponse extends Resource { @SerializedName("courier_connection_id") private String courierConnectionId; - @SerializedName("tracking_origin_country_region") - private String trackingOriginCountryRegion; - - @SerializedName("tracking_destination_country_region") - private String trackingDestinationCountryRegion; - - @SerializedName("tracking_postal_code") - private String trackingPostalCode; - - @SerializedName("tracking_state") - private String trackingState; - @SerializedName("carbon_emissions") private CarbonEmissionsRetrackTrackingByIdResponse carbonEmissions; @@ -503,11 +491,11 @@ public void setSource(String source) { this.source = source; } - public TagV1 getTag() { + public Tag getTag() { return tag; } - public void setTag(TagV1 tag) { + public void setTag(Tag tag) { this.tag = tag; } @@ -764,38 +752,6 @@ public void setCourierConnectionId(String courierConnectionId) { this.courierConnectionId = courierConnectionId; } - public String getTrackingOriginCountryRegion() { - return trackingOriginCountryRegion; - } - - public void setTrackingOriginCountryRegion(String trackingOriginCountryRegion) { - this.trackingOriginCountryRegion = trackingOriginCountryRegion; - } - - public String getTrackingDestinationCountryRegion() { - return trackingDestinationCountryRegion; - } - - public void setTrackingDestinationCountryRegion(String trackingDestinationCountryRegion) { - this.trackingDestinationCountryRegion = trackingDestinationCountryRegion; - } - - public String getTrackingPostalCode() { - return trackingPostalCode; - } - - public void setTrackingPostalCode(String trackingPostalCode) { - this.trackingPostalCode = trackingPostalCode; - } - - public String getTrackingState() { - return trackingState; - } - - public void setTrackingState(String trackingState) { - this.trackingState = trackingState; - } - public CarbonEmissionsRetrackTrackingByIdResponse getCarbonEmissions() { return carbonEmissions; } diff --git a/src/main/java/com/aftership/model/SlugGroupV1.java b/src/main/java/com/aftership/model/SlugGroup.java similarity index 94% rename from src/main/java/com/aftership/model/SlugGroupV1.java rename to src/main/java/com/aftership/model/SlugGroup.java index 482cfd6..82ed094 100644 --- a/src/main/java/com/aftership/model/SlugGroupV1.java +++ b/src/main/java/com/aftership/model/SlugGroup.java @@ -6,7 +6,7 @@ import com.google.gson.annotations.SerializedName; -public enum SlugGroupV1 { +public enum SlugGroup { @SerializedName("amazon-group") AmazonGroup("amazon-group"), @@ -45,7 +45,7 @@ public enum SlugGroupV1 { private final String content; - SlugGroupV1(final String content) { + SlugGroup(final String content) { this.content = content; } diff --git a/src/main/java/com/aftership/model/TagV1.java b/src/main/java/com/aftership/model/Tag.java similarity index 94% rename from src/main/java/com/aftership/model/TagV1.java rename to src/main/java/com/aftership/model/Tag.java index f763c7d..b6662fd 100644 --- a/src/main/java/com/aftership/model/TagV1.java +++ b/src/main/java/com/aftership/model/Tag.java @@ -6,7 +6,7 @@ import com.google.gson.annotations.SerializedName; -public enum TagV1 { +public enum Tag { @SerializedName("Pending") Pending("Pending"), @@ -36,7 +36,7 @@ public enum TagV1 { private final String content; - TagV1(final String content) { + Tag(final String content) { this.content = content; } diff --git a/src/main/java/com/aftership/model/Tracking.java b/src/main/java/com/aftership/model/Tracking.java index 68573cc..cf63ee1 100644 --- a/src/main/java/com/aftership/model/Tracking.java +++ b/src/main/java/com/aftership/model/Tracking.java @@ -106,7 +106,7 @@ public class Tracking extends Resource { private String source; @SerializedName("tag") - private TagV1 tag; + private Tag tag; @SerializedName("subtag") private String subtag; @@ -201,18 +201,6 @@ public class Tracking extends Resource { @SerializedName("courier_connection_id") private String courierConnectionId; - @SerializedName("tracking_origin_country_region") - private String trackingOriginCountryRegion; - - @SerializedName("tracking_destination_country_region") - private String trackingDestinationCountryRegion; - - @SerializedName("tracking_postal_code") - private String trackingPostalCode; - - @SerializedName("tracking_state") - private String trackingState; - @SerializedName("carbon_emissions") private CarbonEmissionsTracking carbonEmissions; @@ -503,11 +491,11 @@ public void setSource(String source) { this.source = source; } - public TagV1 getTag() { + public Tag getTag() { return tag; } - public void setTag(TagV1 tag) { + public void setTag(Tag tag) { this.tag = tag; } @@ -761,38 +749,6 @@ public void setCourierConnectionId(String courierConnectionId) { this.courierConnectionId = courierConnectionId; } - public String getTrackingOriginCountryRegion() { - return trackingOriginCountryRegion; - } - - public void setTrackingOriginCountryRegion(String trackingOriginCountryRegion) { - this.trackingOriginCountryRegion = trackingOriginCountryRegion; - } - - public String getTrackingDestinationCountryRegion() { - return trackingDestinationCountryRegion; - } - - public void setTrackingDestinationCountryRegion(String trackingDestinationCountryRegion) { - this.trackingDestinationCountryRegion = trackingDestinationCountryRegion; - } - - public String getTrackingPostalCode() { - return trackingPostalCode; - } - - public void setTrackingPostalCode(String trackingPostalCode) { - this.trackingPostalCode = trackingPostalCode; - } - - public String getTrackingState() { - return trackingState; - } - - public void setTrackingState(String trackingState) { - this.trackingState = trackingState; - } - public CarbonEmissionsTracking getCarbonEmissions() { return carbonEmissions; } diff --git a/src/main/java/com/aftership/model/TrackingResponseV1.java b/src/main/java/com/aftership/model/TrackingResponse.java similarity index 77% rename from src/main/java/com/aftership/model/TrackingResponseV1.java rename to src/main/java/com/aftership/model/TrackingResponse.java index 7d87d7d..ff39882 100644 --- a/src/main/java/com/aftership/model/TrackingResponseV1.java +++ b/src/main/java/com/aftership/model/TrackingResponse.java @@ -7,19 +7,19 @@ import com.aftership.base.Resource; import com.google.gson.annotations.SerializedName; -public class TrackingResponseV1 extends Resource { +public class TrackingResponse extends Resource { @SerializedName("meta") - private MetaV1 meta; + private Meta meta; @SerializedName("data") private Tracking data; - public MetaV1 getMeta() { + public Meta getMeta() { return meta; } - public void setMeta(MetaV1 meta) { + public void setMeta(Meta meta) { this.meta = meta; } diff --git a/src/main/java/com/aftership/model/TrackingResponseGetMultipleV1.java b/src/main/java/com/aftership/model/TrackingResponseForGetTrackings.java similarity index 53% rename from src/main/java/com/aftership/model/TrackingResponseGetMultipleV1.java rename to src/main/java/com/aftership/model/TrackingResponseForGetTrackings.java index f4ceaaa..d9c5a5d 100644 --- a/src/main/java/com/aftership/model/TrackingResponseGetMultipleV1.java +++ b/src/main/java/com/aftership/model/TrackingResponseForGetTrackings.java @@ -7,27 +7,27 @@ import com.aftership.base.Resource; import com.google.gson.annotations.SerializedName; -public class TrackingResponseGetMultipleV1 extends Resource { +public class TrackingResponseForGetTrackings extends Resource { @SerializedName("meta") - private MetaV1 meta; + private Meta meta; @SerializedName("data") - private DataTrackingResponseGetMultipleV1 data; + private DataTrackingResponseForGetTrackings data; - public MetaV1 getMeta() { + public Meta getMeta() { return meta; } - public void setMeta(MetaV1 meta) { + public void setMeta(Meta meta) { this.meta = meta; } - public DataTrackingResponseGetMultipleV1 getData() { + public DataTrackingResponseForGetTrackings getData() { return data; } - public void setData(DataTrackingResponseGetMultipleV1 data) { + public void setData(DataTrackingResponseForGetTrackings data) { this.data = data; } } diff --git a/src/main/java/com/aftership/model/UpdateTrackingByIdRequest.java b/src/main/java/com/aftership/model/UpdateTrackingByIdRequest.java index b24fde5..2d4fccd 100644 --- a/src/main/java/com/aftership/model/UpdateTrackingByIdRequest.java +++ b/src/main/java/com/aftership/model/UpdateTrackingByIdRequest.java @@ -90,18 +90,6 @@ public class UpdateTrackingByIdRequest extends Resource { @SerializedName("destination_raw_location") private String destinationRawLocation; - @SerializedName("tracking_origin_country_region") - private String trackingOriginCountryRegion; - - @SerializedName("tracking_destination_country_region") - private String trackingDestinationCountryRegion; - - @SerializedName("tracking_postal_code") - private String trackingPostalCode; - - @SerializedName("tracking_state") - private String trackingState; - @SerializedName("location_id") private String locationId; @@ -327,38 +315,6 @@ public void setDestinationRawLocation(String destinationRawLocation) { this.destinationRawLocation = destinationRawLocation; } - public String getTrackingOriginCountryRegion() { - return trackingOriginCountryRegion; - } - - public void setTrackingOriginCountryRegion(String trackingOriginCountryRegion) { - this.trackingOriginCountryRegion = trackingOriginCountryRegion; - } - - public String getTrackingDestinationCountryRegion() { - return trackingDestinationCountryRegion; - } - - public void setTrackingDestinationCountryRegion(String trackingDestinationCountryRegion) { - this.trackingDestinationCountryRegion = trackingDestinationCountryRegion; - } - - public String getTrackingPostalCode() { - return trackingPostalCode; - } - - public void setTrackingPostalCode(String trackingPostalCode) { - this.trackingPostalCode = trackingPostalCode; - } - - public String getTrackingState() { - return trackingState; - } - - public void setTrackingState(String trackingState) { - this.trackingState = trackingState; - } - public String getLocationId() { return locationId; } diff --git a/src/main/java/com/aftership/model/UpdateTrackingByIdResponse.java b/src/main/java/com/aftership/model/UpdateTrackingByIdResponse.java index d02275e..d09932f 100644 --- a/src/main/java/com/aftership/model/UpdateTrackingByIdResponse.java +++ b/src/main/java/com/aftership/model/UpdateTrackingByIdResponse.java @@ -106,7 +106,7 @@ public class UpdateTrackingByIdResponse extends Resource { private String source; @SerializedName("tag") - private TagV1 tag; + private Tag tag; @SerializedName("subtag") private String subtag; @@ -201,18 +201,6 @@ public class UpdateTrackingByIdResponse extends Resource { @SerializedName("courier_connection_id") private String courierConnectionId; - @SerializedName("tracking_origin_country_region") - private String trackingOriginCountryRegion; - - @SerializedName("tracking_destination_country_region") - private String trackingDestinationCountryRegion; - - @SerializedName("tracking_postal_code") - private String trackingPostalCode; - - @SerializedName("tracking_state") - private String trackingState; - @SerializedName("carbon_emissions") private CarbonEmissionsUpdateTrackingByIdResponse carbonEmissions; @@ -503,11 +491,11 @@ public void setSource(String source) { this.source = source; } - public TagV1 getTag() { + public Tag getTag() { return tag; } - public void setTag(TagV1 tag) { + public void setTag(Tag tag) { this.tag = tag; } @@ -764,38 +752,6 @@ public void setCourierConnectionId(String courierConnectionId) { this.courierConnectionId = courierConnectionId; } - public String getTrackingOriginCountryRegion() { - return trackingOriginCountryRegion; - } - - public void setTrackingOriginCountryRegion(String trackingOriginCountryRegion) { - this.trackingOriginCountryRegion = trackingOriginCountryRegion; - } - - public String getTrackingDestinationCountryRegion() { - return trackingDestinationCountryRegion; - } - - public void setTrackingDestinationCountryRegion(String trackingDestinationCountryRegion) { - this.trackingDestinationCountryRegion = trackingDestinationCountryRegion; - } - - public String getTrackingPostalCode() { - return trackingPostalCode; - } - - public void setTrackingPostalCode(String trackingPostalCode) { - this.trackingPostalCode = trackingPostalCode; - } - - public String getTrackingState() { - return trackingState; - } - - public void setTrackingState(String trackingState) { - this.trackingState = trackingState; - } - public CarbonEmissionsUpdateTrackingByIdResponse getCarbonEmissions() { return carbonEmissions; } diff --git a/src/main/java/com/aftership/tracking/CreateTrackingCreator.java b/src/main/java/com/aftership/tracking/CreateTrackingCreator.java index 0c3c752..4c39654 100644 --- a/src/main/java/com/aftership/tracking/CreateTrackingCreator.java +++ b/src/main/java/com/aftership/tracking/CreateTrackingCreator.java @@ -6,6 +6,7 @@ import com.aftership.base.Creator; import com.aftership.http.*; +import com.aftership.http.Request; import com.aftership.model.CreateTrackingRequest; import com.aftership.model.Tracking; import com.google.gson.Gson; @@ -15,7 +16,6 @@ public class CreateTrackingCreator extends Creator { private final Map headerParams = new HashMap<>(8); - private CreateTrackingRequest createTrackingRequest; public CreateTrackingCreator addHeaderParam(final String name, final String value) { if (value == null || value.equals("null")) { @@ -34,6 +34,8 @@ private void setHeaderParams(final Request request) { } } + private CreateTrackingRequest createTrackingRequest; + public CreateTrackingCreator setCreateTrackingRequest( CreateTrackingRequest createTrackingRequest) { this.createTrackingRequest = createTrackingRequest; @@ -42,7 +44,7 @@ public CreateTrackingCreator setCreateTrackingRequest( @Override public Tracking create(AfterShipClient client) throws Exception { - String path = "/tracking/2025-01/trackings"; + String path = "/tracking/2025-04/trackings"; Request request = new Request(HttpMethod.POST, path); request.setBody((new Gson()).toJson(createTrackingRequest)); diff --git a/src/main/java/com/aftership/tracking/DeleteTrackingByIdDeleter.java b/src/main/java/com/aftership/tracking/DeleteTrackingByIdDeleter.java index f3a51dd..2d8b1cb 100644 --- a/src/main/java/com/aftership/tracking/DeleteTrackingByIdDeleter.java +++ b/src/main/java/com/aftership/tracking/DeleteTrackingByIdDeleter.java @@ -8,6 +8,7 @@ import com.aftership.constant.ErrorEnum; import com.aftership.exception.ApiException; import com.aftership.http.*; +import com.aftership.http.Request; import com.aftership.model.Tracking; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; @@ -16,7 +17,6 @@ public class DeleteTrackingByIdDeleter extends Deleter { private final Map headerParams = new HashMap<>(8); - private String id; public DeleteTrackingByIdDeleter addHeaderParam(final String name, final String value) { if (value == null || value.equals("null")) { @@ -35,6 +35,8 @@ private void setHeaderParams(final Request request) { } } + private String id; + public DeleteTrackingByIdDeleter setId(String id) { this.id = id; return this; @@ -47,7 +49,7 @@ public Tracking delete(AfterShipClient client) throws Exception { ErrorEnum.BAD_REQUEST.getCode(), ErrorEnum.BAD_REQUEST.getMessage() + ": `id` is invalid"); } - String path = String.format("/tracking/2025-01/trackings/%s", id); + String path = String.format("/tracking/2025-04/trackings/%s", id); Request request = new Request(HttpMethod.DELETE, path); setHeaderParams(request); Response response = client.request(request); diff --git a/src/main/java/com/aftership/tracking/GetTrackingByIdFetcher.java b/src/main/java/com/aftership/tracking/GetTrackingByIdFetcher.java index b67fead..0e0cac6 100644 --- a/src/main/java/com/aftership/tracking/GetTrackingByIdFetcher.java +++ b/src/main/java/com/aftership/tracking/GetTrackingByIdFetcher.java @@ -8,6 +8,7 @@ import com.aftership.constant.ErrorEnum; import com.aftership.exception.ApiException; import com.aftership.http.*; +import com.aftership.http.Request; import com.aftership.model.Tracking; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; @@ -16,9 +17,6 @@ public class GetTrackingByIdFetcher extends Fetcher { private final Map headerParams = new HashMap<>(8); - private String fields; - private String lang; - private String id; public GetTrackingByIdFetcher addHeaderParam(final String name, final String value) { if (value == null || value.equals("null")) { @@ -37,6 +35,12 @@ private void setHeaderParams(final Request request) { } } + private String fields; + + private String lang; + + private String id; + public GetTrackingByIdFetcher setFields(String fields) { this.fields = fields; return this; @@ -59,7 +63,7 @@ public Tracking fetch(AfterShipClient client) throws Exception { ErrorEnum.BAD_REQUEST.getCode(), ErrorEnum.BAD_REQUEST.getMessage() + ": `id` is invalid"); } - String path = String.format("/tracking/2025-01/trackings/%s", id); + String path = String.format("/tracking/2025-04/trackings/%s", id); Request request = new Request(HttpMethod.GET, path); addQueryParams(request); setHeaderParams(request); diff --git a/src/main/java/com/aftership/tracking/GetTrackingsReader.java b/src/main/java/com/aftership/tracking/GetTrackingsReader.java index 2e08ab5..e701f27 100644 --- a/src/main/java/com/aftership/tracking/GetTrackingsReader.java +++ b/src/main/java/com/aftership/tracking/GetTrackingsReader.java @@ -7,6 +7,7 @@ import com.aftership.base.Page; import com.aftership.base.Reader; import com.aftership.http.*; +import com.aftership.http.Request; import com.aftership.model.GetTrackingsResponse; import com.aftership.model.Tracking; import com.google.gson.Gson; @@ -16,41 +17,59 @@ public class GetTrackingsReader extends Reader { private final Map headerParams = new HashMap<>(8); + + public GetTrackingsReader addHeaderParam(final String name, final String value) { + if (value == null || value.equals("null")) { + return this; + } + + if (!headerParams.containsKey(name)) { + headerParams.put(name, value); + } + return this; + } + + private void setHeaderParams(final Request request) { + for (final Map.Entry entry : headerParams.entrySet()) { + request.addHeaderParam(entry.getKey(), entry.getValue()); + } + } + private String cursor; + private Integer limit; + private String keyword; + private String trackingNumbers; + private String slug; + private Integer transitTime; + private String origin; + private String destination; + private String tag; + private String createdAtMin; + private String createdAtMax; + private String updatedAtMin; + private String updatedAtMax; + private String fields; + private String returnToSender; - private String courierDestinationCountryRegion; - private String shipmentTags; - private String orderId; - public GetTrackingsReader addHeaderParam(final String name, final String value) { - if (value == null || value.equals("null")) { - return this; - } + private String courierDestinationCountryRegion; - if (!headerParams.containsKey(name)) { - headerParams.put(name, value); - } - return this; - } + private String shipmentTags; - private void setHeaderParams(final Request request) { - for (final Map.Entry entry : headerParams.entrySet()) { - request.addHeaderParam(entry.getKey(), entry.getValue()); - } - } + private String orderId; public GetTrackingsReader setCursor(String cursor) { this.cursor = cursor; @@ -145,7 +164,7 @@ public GetTrackingsReader setOrderId(String orderId) { @Override public Page read(AfterShipClient client) throws Exception { - String path = "/tracking/2025-01/trackings"; + String path = "/tracking/2025-04/trackings"; Request request = new Request(HttpMethod.GET, path); addQueryParams(request); setHeaderParams(request); @@ -169,7 +188,7 @@ private void addQueryParams(final Request request) { if (cursor != null) { request.addQueryParam("cursor", cursor); } - if (limit != null && limit > 0) { + if (limit != null) { request.addQueryParam("limit", String.valueOf(limit)); } if (keyword != null) { @@ -181,7 +200,7 @@ private void addQueryParams(final Request request) { if (slug != null) { request.addQueryParam("slug", slug); } - if (transitTime != null && transitTime > 0) { + if (transitTime != null) { request.addQueryParam("transit_time", String.valueOf(transitTime)); } if (origin != null) { diff --git a/src/main/java/com/aftership/tracking/MarkTrackingCompletedByIdCreator.java b/src/main/java/com/aftership/tracking/MarkTrackingCompletedByIdCreator.java index 7832bf7..30e0986 100644 --- a/src/main/java/com/aftership/tracking/MarkTrackingCompletedByIdCreator.java +++ b/src/main/java/com/aftership/tracking/MarkTrackingCompletedByIdCreator.java @@ -8,6 +8,7 @@ import com.aftership.constant.ErrorEnum; import com.aftership.exception.ApiException; import com.aftership.http.*; +import com.aftership.http.Request; import com.aftership.model.MarkTrackingCompletedByIdRequest; import com.aftership.model.Tracking; import com.google.gson.Gson; @@ -17,8 +18,6 @@ public class MarkTrackingCompletedByIdCreator extends Creator { private final Map headerParams = new HashMap<>(8); - private MarkTrackingCompletedByIdRequest markTrackingCompletedByIdRequest; - private String id; public MarkTrackingCompletedByIdCreator addHeaderParam(final String name, final String value) { if (value == null || value.equals("null")) { @@ -37,12 +36,16 @@ private void setHeaderParams(final Request request) { } } + private MarkTrackingCompletedByIdRequest markTrackingCompletedByIdRequest; + public MarkTrackingCompletedByIdCreator setMarkTrackingCompletedByIdRequest( MarkTrackingCompletedByIdRequest markTrackingCompletedByIdRequest) { this.markTrackingCompletedByIdRequest = markTrackingCompletedByIdRequest; return this; } + private String id; + public MarkTrackingCompletedByIdCreator setId(String id) { this.id = id; return this; @@ -55,7 +58,7 @@ public Tracking create(AfterShipClient client) throws Exception { ErrorEnum.BAD_REQUEST.getCode(), ErrorEnum.BAD_REQUEST.getMessage() + ": `id` is invalid"); } - String path = String.format("/tracking/2025-01/trackings/%s/mark-as-completed", id); + String path = String.format("/tracking/2025-04/trackings/%s/mark-as-completed", id); Request request = new Request(HttpMethod.POST, path); request.setBody((new Gson()).toJson(markTrackingCompletedByIdRequest)); diff --git a/src/main/java/com/aftership/tracking/RetrackTrackingByIdCreator.java b/src/main/java/com/aftership/tracking/RetrackTrackingByIdCreator.java index ecf7a84..fffa52b 100644 --- a/src/main/java/com/aftership/tracking/RetrackTrackingByIdCreator.java +++ b/src/main/java/com/aftership/tracking/RetrackTrackingByIdCreator.java @@ -8,6 +8,7 @@ import com.aftership.constant.ErrorEnum; import com.aftership.exception.ApiException; import com.aftership.http.*; +import com.aftership.http.Request; import com.aftership.model.Tracking; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; @@ -16,7 +17,6 @@ public class RetrackTrackingByIdCreator extends Creator { private final Map headerParams = new HashMap<>(8); - private String id; public RetrackTrackingByIdCreator addHeaderParam(final String name, final String value) { if (value == null || value.equals("null")) { @@ -35,6 +35,8 @@ private void setHeaderParams(final Request request) { } } + private String id; + public RetrackTrackingByIdCreator setId(String id) { this.id = id; return this; @@ -47,7 +49,7 @@ public Tracking create(AfterShipClient client) throws Exception { ErrorEnum.BAD_REQUEST.getCode(), ErrorEnum.BAD_REQUEST.getMessage() + ": `id` is invalid"); } - String path = String.format("/tracking/2025-01/trackings/%s/retrack", id); + String path = String.format("/tracking/2025-04/trackings/%s/retrack", id); Request request = new Request(HttpMethod.POST, path); setHeaderParams(request); Response response = client.request(request); diff --git a/src/main/java/com/aftership/tracking/TrackingResource.java b/src/main/java/com/aftership/tracking/TrackingResource.java index 79ec1f7..b71ee9c 100644 --- a/src/main/java/com/aftership/tracking/TrackingResource.java +++ b/src/main/java/com/aftership/tracking/TrackingResource.java @@ -7,31 +7,31 @@ import com.aftership.base.Resource; public class TrackingResource extends Resource { - public static GetTrackingByIdFetcher getTrackingById() { - return new GetTrackingByIdFetcher(); - } - public static UpdateTrackingByIdUpdater updateTrackingById() { return new UpdateTrackingByIdUpdater(); } - public static MarkTrackingCompletedByIdCreator markTrackingCompletedById() { - return new MarkTrackingCompletedByIdCreator(); + public static DeleteTrackingByIdDeleter deleteTrackingById() { + return new DeleteTrackingByIdDeleter(); } - public static GetTrackingsReader getTrackings() { - return new GetTrackingsReader(); + public static RetrackTrackingByIdCreator retrackTrackingById() { + return new RetrackTrackingByIdCreator(); } public static CreateTrackingCreator createTracking() { return new CreateTrackingCreator(); } - public static DeleteTrackingByIdDeleter deleteTrackingById() { - return new DeleteTrackingByIdDeleter(); + public static MarkTrackingCompletedByIdCreator markTrackingCompletedById() { + return new MarkTrackingCompletedByIdCreator(); } - public static RetrackTrackingByIdCreator retrackTrackingById() { - return new RetrackTrackingByIdCreator(); + public static GetTrackingsReader getTrackings() { + return new GetTrackingsReader(); + } + + public static GetTrackingByIdFetcher getTrackingById() { + return new GetTrackingByIdFetcher(); } } diff --git a/src/main/java/com/aftership/tracking/UpdateTrackingByIdUpdater.java b/src/main/java/com/aftership/tracking/UpdateTrackingByIdUpdater.java index a5b9037..09b36bd 100644 --- a/src/main/java/com/aftership/tracking/UpdateTrackingByIdUpdater.java +++ b/src/main/java/com/aftership/tracking/UpdateTrackingByIdUpdater.java @@ -8,6 +8,7 @@ import com.aftership.constant.ErrorEnum; import com.aftership.exception.ApiException; import com.aftership.http.*; +import com.aftership.http.Request; import com.aftership.model.Tracking; import com.aftership.model.UpdateTrackingByIdRequest; import com.google.gson.Gson; @@ -17,8 +18,6 @@ public class UpdateTrackingByIdUpdater extends Updater { private final Map headerParams = new HashMap<>(8); - private UpdateTrackingByIdRequest updateTrackingByIdRequest; - private String id; public UpdateTrackingByIdUpdater addHeaderParam(final String name, final String value) { if (value == null || value.equals("null")) { @@ -37,12 +36,16 @@ private void setHeaderParams(final Request request) { } } + private UpdateTrackingByIdRequest updateTrackingByIdRequest; + public UpdateTrackingByIdUpdater setUpdateTrackingByIdRequest( UpdateTrackingByIdRequest updateTrackingByIdRequest) { this.updateTrackingByIdRequest = updateTrackingByIdRequest; return this; } + private String id; + public UpdateTrackingByIdUpdater setId(String id) { this.id = id; return this; @@ -55,7 +58,7 @@ public Tracking update(AfterShipClient client) throws Exception { ErrorEnum.BAD_REQUEST.getCode(), ErrorEnum.BAD_REQUEST.getMessage() + ": `id` is invalid"); } - String path = String.format("/tracking/2025-01/trackings/%s", id); + String path = String.format("/tracking/2025-04/trackings/%s", id); Request request = new Request(HttpMethod.PUT, path); request.setBody((new Gson()).toJson(updateTrackingByIdRequest));