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);
         }
     }
 

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

@@ -21,7 +21,7 @@
  * <p>ApiException class.</p>
  */
 @SuppressWarnings("serial")
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.10.0")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0")
 public class ApiException extends Exception {
     private static final long serialVersionUID = 1L;
 

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

@@ -13,29 +13,51 @@
 
 package pl.wtx.woocommerce.api.client.invoker;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.10.0")
+import java.util.Objects;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Supplier;
+
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0")
 public class Configuration {
-    public static final String VERSION = "v3";
-
-    private static ApiClient defaultApiClient = new ApiClient();
-
-    /**
-     * Get the default API client, which would be used when creating API
-     * instances without providing an API client.
-     *
-     * @return Default API client
-     */
-    public static ApiClient getDefaultApiClient() {
-        return defaultApiClient;
-    }
+  public static final String VERSION = "v3";
+
+  private static final AtomicReference<ApiClient> defaultApiClient = new AtomicReference<>();
+  private static volatile Supplier<ApiClient> apiClientFactory = ApiClient::new;
 
-    /**
-     * Set the default API client, which would be used when creating API
-     * instances without providing an API client.
-     *
-     * @param apiClient API client
-     */
-    public static void setDefaultApiClient(ApiClient apiClient) {
-        defaultApiClient = apiClient;
+  /**
+   * Get the default API client, which would be used when creating API instances without providing an API client.
+   *
+   * @return Default API client
+   */
+  public static ApiClient getDefaultApiClient() {
+    ApiClient client = defaultApiClient.get();
+    if (client == null) {
+      client = defaultApiClient.updateAndGet(val -> {
+        if (val != null) { // changed by another thread
+          return val;
+        }
+        return apiClientFactory.get();
+      });
     }
-}
+    return client;
+  }
+
+  /**
+   * Set the default API client, which would be used when creating API instances without providing an API client.
+   *
+   * @param apiClient API client
+   */
+  public static void setDefaultApiClient(ApiClient apiClient) {
+    defaultApiClient.set(apiClient);
+  }
+
+  /**
+   * set the callback used to create new ApiClient objects
+   */
+  public static void setApiClientFactory(Supplier<ApiClient> factory) {
+    apiClientFactory = Objects.requireNonNull(factory);
+  }
+
+  private Configuration() {
+  }
+}

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

@@ -27,8 +27,11 @@
 import okio.ByteString;
 
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.io.StringReader;
 import java.lang.reflect.Type;
+import java.nio.charset.StandardCharsets;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.ParsePosition;
@@ -183,6 +186,28 @@ public static <T> T deserialize(String body, Type returnType) {
         }
     }
 
+    /**
+    * Deserialize the given JSON InputStream to a Java object.
+    *
+    * @param <T>         Type
+    * @param inputStream The JSON InputStream
+    * @param returnType  The type to deserialize into
+    * @return The deserialized Java object
+    */
+    @SuppressWarnings("unchecked")
+    public static <T> T deserialize(InputStream inputStream, Type returnType) throws IOException {
+        try (InputStreamReader reader = new InputStreamReader(inputStream, StandardCharsets.UTF_8)) {
+        if (isLenientOnJson) {
+            // see https://google-gson.googlecode.com/svn/trunk/gson/docs/javadocs/com/google/gson/stream/JsonReader.html#setLenient(boolean)
+            JsonReader jsonReader = new JsonReader(reader);
+            jsonReader.setLenient(true);
+            return gson.fromJson(jsonReader, returnType);
+            } else {
+                return gson.fromJson(reader, returnType);
+            }
+        }
+    }
+
     /**
      * Gson TypeAdapter for Byte Array type
      */

src/main/java/pl/wtx/woocommerce/api/client/config/OffsetDateTimeAdapter.java

@@ -13,7 +13,7 @@
 
 package pl.wtx.woocommerce.api.client.invoker;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.10.0")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0")
 public class Pair {
     private String name = "";
     private String value = "";

src/main/java/pl/wtx/woocommerce/api/client/invoker/ApiClient.java

@@ -18,7 +18,7 @@
 /**
  * Representing a Server configuration.
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.10.0")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0")
 public class ServerConfiguration {
     public String URL;
     public String description;

src/main/java/pl/wtx/woocommerce/api/client/invoker/ApiException.java

@@ -18,7 +18,7 @@
 /**
  * Representing a Server Variable for server URL template substitution.
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.10.0")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0")
 public class ServerVariable {
     public String description;
     public String defaultValue;

src/main/java/pl/wtx/woocommerce/api/client/invoker/Configuration.java

@@ -16,7 +16,7 @@
 import java.util.Collection;
 import java.util.Iterator;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.10.0")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).

src/main/java/pl/wtx/woocommerce/api/client/invoker/JSON.java

@@ -20,7 +20,7 @@
 import java.util.Map;
 import java.util.List;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.10.0")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0")
 public class ApiKeyAuth implements Authentication {
   private final String location;
   private final String paramName;

src/main/java/pl/wtx/woocommerce/api/client/invoker/Pair.java

@@ -20,6 +20,7 @@
 import java.util.Map;
 import java.util.List;
 
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0")
 public interface Authentication {
     /**
      * Apply authentication settings to header and query params.

src/main/java/pl/wtx/woocommerce/api/client/invoker/ServerConfiguration.java

@@ -22,7 +22,7 @@
 import java.util.Optional;
 import java.util.function.Supplier;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.10.0")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0")
 public class HttpBearerAuth implements Authentication {
   private final String scheme;
   private Supplier<String> tokenSupplier;

src/main/java/pl/wtx/woocommerce/api/client/invoker/ServerVariable.java

@@ -21,7 +21,7 @@
 /**
  * Abstract class for oneOf,anyOf schemas defined in OpenAPI spec
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.10.0")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0")
 public abstract class AbstractOpenApiSchema {
 
     // store the actual instance of the schema/object

src/main/java/pl/wtx/woocommerce/api/client/invoker/StringUtil.java

@@ -49,7 +49,7 @@
 /**
  * ApiError
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.10.0")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0")
 public class ApiError {
   public static final String SERIALIZED_NAME_CODE = "code";
   @SerializedName(SERIALIZED_NAME_CODE)

src/main/java/pl/wtx/woocommerce/api/client/invoker/auth/ApiKeyAuth.java

@@ -48,7 +48,7 @@
 /**
  * ApiErrorData
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.10.0")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0")
 public class ApiErrorData {
   public static final String SERIALIZED_NAME_STATUS = "status";
   @SerializedName(SERIALIZED_NAME_STATUS)

src/main/java/pl/wtx/woocommerce/api/client/invoker/auth/Authentication.java

@@ -48,7 +48,7 @@
 /**
  * Billing
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.10.0")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0")
 public class Billing {
   public static final String SERIALIZED_NAME_FIRST_NAME = "first_name";
   @SerializedName(SERIALIZED_NAME_FIRST_NAME)

src/main/java/pl/wtx/woocommerce/api/client/invoker/auth/HttpBearerAuth.java

@@ -54,7 +54,7 @@
 /**
  * Customer
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.10.0")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0")
 public class Customer {
   public static final String SERIALIZED_NAME_ID = "id";
   @SerializedName(SERIALIZED_NAME_ID)