Merge pull request #64 from panxl6/bugfix/ABU23974

fix: change some field type to string to contain zone info

Author: panxl6

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [4.0.0] - 2024-01-03
+### Fixed
+- Change fields from `Date` to `String` to contain zone info.
+
 ## [3.0.0] - 2023-11-24
 ### Added
 - Support new api versions 2023-10 (https://github.com/AfterShip/aftership-sdk-java/pull/60)

README.md

@@ -18,14 +18,14 @@ Requirements:
 <dependency>
   <groupId>com.aftership</groupId>
   <artifactId>aftership-sdk</artifactId>
-  <version>3.0.0</version>
+  <version>4.0.0</version>
 </dependency>
 ```
 
 ### Gradle
 
 ```text
-implementation "com.aftership:aftership-sdk:3.0.0"
+implementation "com.aftership:aftership-sdk:4.0.0"
 ```
 
 

aftership-sdk/src/main/java/com/aftership/sdk/model/tracking/NewTracking.java

@@ -1,6 +1,5 @@
 package com.aftership.sdk.model.tracking;
 
-import java.util.Date;
 import java.util.Map;
 
 import lombok.Data;
@@ -172,9 +171,9 @@ public class NewTracking {
   /**
    * Date and time of the order created
    *
-   * <p>Date
+   * <p>String
    */
-  private Date orderDate;
+  private String orderDate;
 
   /**
    * Text field for order number

aftership-sdk/src/main/java/com/aftership/sdk/model/tracking/Tracking.java

@@ -177,9 +177,9 @@ public class Tracking {
   /**
    * Date and time of the order created
    *
-   * <p>Date
+   * <p>String
    */
-  private Date orderDate;
+  private String orderDate;
 
   /**
    * Origin country of the tracking. ISO Alpha-3 (three letters).
@@ -198,16 +198,16 @@ public class Tracking {
   /**
    * Date and time the tracking was picked up
    *
-   * <p>DateTime
+   * <p>String
    */
-  private Date shipmentPickupDate;
+  private String shipmentPickupDate;
 
   /**
    * Date and time the tracking was delivered
    *
-   * <p>DateTime
+   * <p>String
    */
-  private Date shipmentDeliveryDate;
+  private String shipmentDeliveryDate;
 
   /**
    * Shipment type provided by carrier (if any).
@@ -393,7 +393,7 @@ public class Tracking {
    *
    * <p><font color="red">String or Null</font>
    */
-  private Date firstAttemptedAt;
+  private String firstAttemptedAt;
 
   /**
    * Delivery instructions (delivery date or address) can be modified by visiting the link if

aftership-sdk/src/main/java/com/aftership/sdk/model/tracking/UpdateTracking.java

@@ -2,7 +2,6 @@
 
 import lombok.Data;
 
-import java.util.Date;
 import java.util.Map;
 
 /**
@@ -146,9 +145,9 @@ public class UpdateTracking {
   /**
    * Date and time of the order created
    *
-   * <p>Date
+   * <p>String
    */
-  private Date orderDate;
+  private String orderDate;
 
   /**
    * The carrier’s shipment type. When you input this field, AfterShip will not get updates from the carrier.

build.gradle

@@ -17,7 +17,7 @@ buildscript {
 
 allprojects {
     group 'com.aftership'
-    version '3.0.0'
+    version '4.0.0'
 
     repositories {
         mavenCentral()
@@ -110,7 +110,7 @@ project(':aftership-sample') {
     dependencies {
 //        compile project(':aftership-sdk')
         implementation "com.squareup.okhttp3:okhttp:${okhttpVersion}"
-        implementation "com.aftership:aftership-sdk:3.0.0"
+        implementation "com.aftership:aftership-sdk:4.0.0"
     }
 
     jar {