Client update

Author: maciek365

README.md

@@ -65,7 +65,7 @@ This API client provides a type-safe Java interface for WooCommerce REST API v3,
 
 ## 📦 Version information
 
-- **Current version**: `0.9.5`
+- **Current version**: `0.9.6`
 - **Supported WooCommerce API version**: `v3`
 - **Java compatibility**: Java 8+
 
@@ -106,7 +106,7 @@ Then add the locally built artifact to your project:
 <dependency>
     <groupId>pl.wtx.woocommerce</groupId>
     <artifactId>woocommerce-api-client</artifactId>
-    <version>0.9.5</version>
+    <version>0.9.6</version>
 </dependency>
 ```
 

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>pl.wtx.woocommerce</groupId>
     <artifactId>woocommerce-api-client</artifactId>
-    <version>0.9.5</version>
+    <version>0.9.6</version>
     <packaging>jar</packaging>
 
     <name>WooCommerce API Client for Java</name>

src/main/java/pl/wtx/woocommerce/api/client/CustomersApi.java

@@ -212,7 +212,7 @@ public okhttp3.Call reportOrderTotalsSummaryAsync(final ApiCallback<List<ReportO
         <tr><td> 401 </td><td> Unauthorized </td><td>  -  </td></tr>
      </table>
      */
-    public okhttp3.Call reportSalesSummaryCall(String period, String dateMin, String dateMax, final ApiCallback _callback) throws ApiException {
+    public okhttp3.Call reportSalesSummaryCall(@javax.annotation.Nullable String period, @javax.annotation.Nullable String dateMin, @javax.annotation.Nullable String dateMax, final ApiCallback _callback) throws ApiException {
         String basePath = null;
         // Operation Servers
         String[] localBasePaths = new String[] {  };
@@ -269,7 +269,7 @@ public okhttp3.Call reportSalesSummaryCall(String period, String dateMin, String
     }
 
     @SuppressWarnings("rawtypes")
-    private okhttp3.Call reportSalesSummaryValidateBeforeCall(String period, String dateMin, String dateMax, final ApiCallback _callback) throws ApiException {
+    private okhttp3.Call reportSalesSummaryValidateBeforeCall(@javax.annotation.Nullable String period, @javax.annotation.Nullable String dateMin, @javax.annotation.Nullable String dateMax, final ApiCallback _callback) throws ApiException {
         return reportSalesSummaryCall(period, dateMin, dateMax, _callback);
 
     }
@@ -291,7 +291,7 @@ private okhttp3.Call reportSalesSummaryValidateBeforeCall(String period, String
         <tr><td> 401 </td><td> Unauthorized </td><td>  -  </td></tr>
      </table>
      */
-    public List<ReportSalesSummary> reportSalesSummary(String period, String dateMin, String dateMax) throws ApiException {
+    public List<ReportSalesSummary> reportSalesSummary(@javax.annotation.Nullable String period, @javax.annotation.Nullable String dateMin, @javax.annotation.Nullable String dateMax) throws ApiException {
         ApiResponse<List<ReportSalesSummary>> localVarResp = reportSalesSummaryWithHttpInfo(period, dateMin, dateMax);
         return localVarResp.getData();
     }
@@ -313,7 +313,7 @@ public List<ReportSalesSummary> reportSalesSummary(String period, String dateMin
         <tr><td> 401 </td><td> Unauthorized </td><td>  -  </td></tr>
      </table>
      */
-    public ApiResponse<List<ReportSalesSummary>> reportSalesSummaryWithHttpInfo(String period, String dateMin, String dateMax) throws ApiException {
+    public ApiResponse<List<ReportSalesSummary>> reportSalesSummaryWithHttpInfo(@javax.annotation.Nullable String period, @javax.annotation.Nullable String dateMin, @javax.annotation.Nullable String dateMax) throws ApiException {
         okhttp3.Call localVarCall = reportSalesSummaryValidateBeforeCall(period, dateMin, dateMax, null);
         Type localVarReturnType = new TypeToken<List<ReportSalesSummary>>(){}.getType();
         return localVarApiClient.execute(localVarCall, localVarReturnType);
@@ -337,7 +337,7 @@ public ApiResponse<List<ReportSalesSummary>> reportSalesSummaryWithHttpInfo(Stri
         <tr><td> 401 </td><td> Unauthorized </td><td>  -  </td></tr>
      </table>
      */
-    public okhttp3.Call reportSalesSummaryAsync(String period, String dateMin, String dateMax, final ApiCallback<List<ReportSalesSummary>> _callback) throws ApiException {
+    public okhttp3.Call reportSalesSummaryAsync(@javax.annotation.Nullable String period, @javax.annotation.Nullable String dateMin, @javax.annotation.Nullable String dateMax, final ApiCallback<List<ReportSalesSummary>> _callback) throws ApiException {
 
         okhttp3.Call localVarCall = reportSalesSummaryValidateBeforeCall(period, dateMin, dateMax, _callback);
         Type localVarReturnType = new TypeToken<List<ReportSalesSummary>>(){}.getType();

src/main/java/pl/wtx/woocommerce/api/client/OrdersApi.java

@@ -1,9 +1,11 @@
 package pl.wtx.woocommerce.api.client.config;
 
 import java.io.IOException;
+import java.time.LocalDateTime;
 import java.time.OffsetDateTime;
 import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
 
 import com.google.gson.TypeAdapter;
 import com.google.gson.stream.JsonReader;
@@ -22,6 +24,7 @@ public void write(JsonWriter out, OffsetDateTime value) throws IOException {
         } else {
             out.nullValue();
         }
+
     }
 
     @Override
@@ -33,8 +36,14 @@ public OffsetDateTime read(JsonReader in) throws IOException {
         }
 
         String date = in.nextString();
+
         if (date != null && !date.isEmpty()) {
-            return OffsetDateTime.parse(date, FORMATTER.withZone(ZoneOffset.UTC));
+            try {
+                return OffsetDateTime.parse(date);
+            } catch (DateTimeParseException e) {
+                LocalDateTime ldt = LocalDateTime.parse(date);
+                return ldt.atOffset(ZoneOffset.UTC);
+            }
         }
 
         return null;

src/main/java/pl/wtx/woocommerce/api/client/ProductCategoriesApi.java

@@ -912,17 +912,8 @@ public <T> T deserialize(Response response, Type returnType) throws ApiException
             return (T) downloadFileFromResponse(response);
         }
 
-        String respBody;
-        try {
-            if (response.body() != null)
-                respBody = response.body().string();
-            else
-                respBody = null;
-        } catch (IOException e) {
-            throw new ApiException(e);
-        }
-
-        if (respBody == null || "".equals(respBody)) {
+        ResponseBody respBody = response.body();
+        if (respBody == null) {
             return null;
         }
 
@@ -931,17 +922,25 @@ public <T> T deserialize(Response response, Type returnType) throws ApiException
             // ensuring a default content type
             contentType = "application/json";
         }
-        if (isJsonMime(contentType)) {
-            return JSON.deserialize(respBody, returnType);
-        } else if (returnType.equals(String.class)) {
-            // Expecting string, return the raw response body.
-            return (T) respBody;
-        } else {
-            throw new ApiException(
+        try {
+            if (isJsonMime(contentType)) {
+                return JSON.deserialize(respBody.byteStream(), returnType);
+            } else if (returnType.equals(String.class)) {
+                String respBodyString = respBody.string();
+                if (respBodyString.isEmpty()) {
+                    return null;
+                }
+                // Expecting string, return the raw response body.
+                return (T) respBodyString;
+            } else {
+                throw new ApiException(
                     "Content type \"" + contentType + "\" is not supported for type: " + returnType,
                     response.code(),
                     response.headers().toMultimap(),
-                    respBody);
+                    response.body().string());
+            }
+        } catch (IOException e) {
+            throw new ApiException(e);
         }
     }