Merge pull request #207 from XeroAPI/sid-development

Unit test fixes

Author: SidneyAllen

README.md

@@ -10,7 +10,7 @@ Version 4.x and higher of Xero Java SDK only supports OAuth2 authentication and
 * fixed asset 
 * projects
 * payroll au
-* payroll uk - beta
+* payroll uk
 
 Coming soon 
 * payroll nz
@@ -178,7 +178,6 @@ try {
 We've replace a specific logging plugin (org.apache.logging.log4j) with a logging facade org.slf4j. With version 4.x we'll use SLF4J and allow you to plug in the logging library of your choice at deployment time. This [blog post](https://www.baeldung.com/slf4j-with-log4j2-logback) explains how to add log4j2 for logging. To configure, add a log4j.properties file to the Resources directory.
 
 
-
 ## Looking for version 3.x of the SDK?
 Codebase, samples and setup instructions located in [java-3.x branch](https://github.com/XeroAPI/Xero-Java/tree/java-3.x).
 

pom.xml

@@ -5,7 +5,7 @@
     <artifactId>xero-java</artifactId>
     <packaging>jar</packaging>
     <name>xero-java</name>
-    <version>4.0.2</version>
+    <version>4.1.0</version>
     <url>https://github.com/XeroAPI/Xero-Java</url>
     <description>This is the official Java SDK for Xero API</description>
     <licenses>

src/main/java/com/xero/api/client/AccountingApi.java

@@ -93,7 +93,7 @@ public class AccountingApi {
     private ApiClient apiClient;
     private static AccountingApi instance = null;
     private String userAgent = "Default";
-    private String version = "4.0.2";
+    private String version = "4.1.0";
     final static Logger logger = LoggerFactory.getLogger(AccountingApi.class);
 
     public AccountingApi() {
@@ -10301,14 +10301,15 @@ public HttpResponse getPaymentServicesForHttpResponse(String accessToken,  Strin
     * @param ifModifiedSince Only records created or modified since this timestamp will be returned
     * @param where Filter by an any element
     * @param order Order by an any element
+    * @param page Up to 100 payments will be returned in a single API call
     * @param accessToken Authorization token for user set in header of each request
     * @return Payments
     * @throws IOException if an error occurs while attempting to invoke the API
     **/
-    public Payments  getPayments(String accessToken, String xeroTenantId, OffsetDateTime ifModifiedSince, String where, String order) throws IOException {
+    public Payments  getPayments(String accessToken, String xeroTenantId, OffsetDateTime ifModifiedSince, String where, String order, Integer page) throws IOException {
         try {
             TypeReference<Payments> typeRef = new TypeReference<Payments>() {};
-            HttpResponse response = getPaymentsForHttpResponse(accessToken, xeroTenantId, ifModifiedSince, where, order);
+            HttpResponse response = getPaymentsForHttpResponse(accessToken, xeroTenantId, ifModifiedSince, where, order, page);
             return apiClient.getObjectMapper().readValue(response.getContent(), typeRef);
         } catch (HttpResponseException e) {
             if (logger.isDebugEnabled()) {
@@ -10323,7 +10324,7 @@ public Payments  getPayments(String accessToken, String xeroTenantId, OffsetDate
         return null;
     }
 
-    public HttpResponse getPaymentsForHttpResponse(String accessToken,  String xeroTenantId,  OffsetDateTime ifModifiedSince,  String where,  String order) throws IOException {
+    public HttpResponse getPaymentsForHttpResponse(String accessToken,  String xeroTenantId,  OffsetDateTime ifModifiedSince,  String where,  String order,  Integer page) throws IOException {
         // verify the required parameter 'xeroTenantId' is set
         if (xeroTenantId == null) {
             throw new IllegalArgumentException("Missing the required parameter 'xeroTenantId' when calling getPayments");
@@ -10359,6 +10360,16 @@ public HttpResponse getPaymentsForHttpResponse(String accessToken,  String xeroT
             } else {
                 uriBuilder = uriBuilder.queryParam(key, value);
             }
+        }        if (page != null) {
+            String key = "page";
+            Object value = page;
+            if (value instanceof Collection) {
+                uriBuilder = uriBuilder.queryParam(key, ((Collection) value).toArray());
+            } else if (value instanceof Object[]) {
+                uriBuilder = uriBuilder.queryParam(key, (Object[]) value);
+            } else {
+                uriBuilder = uriBuilder.queryParam(key, value);
+            }
         }
         String url = uriBuilder.build().toString();
         GenericUrl genericUrl = new GenericUrl(url);

src/main/java/com/xero/api/client/AssetApi.java

@@ -47,7 +47,7 @@ public class AssetApi {
     private ApiClient apiClient;
     private static AssetApi instance = null;
     private String userAgent = "Default";
-    private String version = "4.0.2";
+    private String version = "4.1.0";
     final static Logger logger = LoggerFactory.getLogger(AssetApi.class);
 
     public AssetApi() {

src/main/java/com/xero/api/client/BankFeedsApi.java

@@ -47,7 +47,7 @@ public class BankFeedsApi {
     private ApiClient apiClient;
     private static BankFeedsApi instance = null;
     private String userAgent = "Default";
-    private String version = "4.0.2";
+    private String version = "4.1.0";
     final static Logger logger = LoggerFactory.getLogger(BankFeedsApi.class);
 
     public BankFeedsApi() {

src/main/java/com/xero/api/client/IdentityApi.java

@@ -43,7 +43,7 @@ public class IdentityApi {
     private ApiClient apiClient;
     private static IdentityApi instance = null;
     private String userAgent = "Default";
-    private String version = "4.0.2";
+    private String version = "4.1.0";
     final static Logger logger = LoggerFactory.getLogger(IdentityApi.class);
 
     public IdentityApi() {

src/main/java/com/xero/api/client/PayrollAuApi.java

@@ -63,7 +63,7 @@ public class PayrollAuApi {
     private ApiClient apiClient;
     private static PayrollAuApi instance = null;
     private String userAgent = "Default";
-    private String version = "4.0.2";
+    private String version = "4.1.0";
     final static Logger logger = LoggerFactory.getLogger(PayrollAuApi.class);
 
     public PayrollAuApi() {

src/main/java/com/xero/api/client/PayrollUkApi.java

@@ -27,6 +27,7 @@
 import com.xero.models.payrolluk.EmployeeOpeningBalances;
 import com.xero.models.payrolluk.EmployeeOpeningBalancesObject;
 import com.xero.models.payrolluk.EmployeePayTemplateObject;
+import com.xero.models.payrolluk.EmployeePayTemplates;
 import com.xero.models.payrolluk.EmployeeStatutoryLeaveBalanceObject;
 import com.xero.models.payrolluk.EmployeeStatutoryLeavesSummaries;
 import com.xero.models.payrolluk.EmployeeStatutorySickLeave;
@@ -104,7 +105,7 @@ public class PayrollUkApi {
     private ApiClient apiClient;
     private static PayrollUkApi instance = null;
     private String userAgent = "Default";
-    private String version = "4.0.2";
+    private String version = "4.1.0";
     final static Logger logger = LoggerFactory.getLogger(PayrollUkApi.class);
 
     public PayrollUkApi() {
@@ -1142,12 +1143,12 @@ public HttpResponse createLeaveTypeForHttpResponse(String accessToken,  String x
     * @param employeeId Employee id for single object
     * @param earningsTemplate The earningsTemplate parameter
     * @param accessToken Authorization token for user set in header of each request
-    * @return EmployeePayTemplateObject
+    * @return EmployeePayTemplates
     * @throws IOException if an error occurs while attempting to invoke the API
     **/
-    public EmployeePayTemplateObject  createMultipleEmployeeEarningsTemplate(String accessToken, String xeroTenantId, UUID employeeId, List<EarningsTemplate> earningsTemplate) throws IOException {
+    public EmployeePayTemplates  createMultipleEmployeeEarningsTemplate(String accessToken, String xeroTenantId, UUID employeeId, List<EarningsTemplate> earningsTemplate) throws IOException {
         try {
-            TypeReference<EmployeePayTemplateObject> typeRef = new TypeReference<EmployeePayTemplateObject>() {};
+            TypeReference<EmployeePayTemplates> typeRef = new TypeReference<EmployeePayTemplates>() {};
             HttpResponse response = createMultipleEmployeeEarningsTemplateForHttpResponse(accessToken, xeroTenantId, employeeId, earningsTemplate);
             return apiClient.getObjectMapper().readValue(response.getContent(), typeRef);
         } catch (HttpResponseException e) {
@@ -1157,9 +1158,9 @@ public EmployeePayTemplateObject  createMultipleEmployeeEarningsTemplate(String
             }
             XeroApiExceptionHandler handler = new XeroApiExceptionHandler();
              if (e.getStatusCode() == 400 || e.getStatusCode() == 405) {
-                TypeReference<EmployeePayTemplateObject> errorTypeRef = new TypeReference<EmployeePayTemplateObject>() {};
-                EmployeePayTemplateObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef);
-                handler.validationError(e.getStatusCode(),"EmployeePayTemplateObject",object.getProblem());
+                TypeReference<EmployeePayTemplates> errorTypeRef = new TypeReference<EmployeePayTemplates>() {};
+                EmployeePayTemplates object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef);
+                handler.validationError(e.getStatusCode(),"EmployeePayTemplates",object.getProblem());
             } else {
                 handler.execute(e);
             }
@@ -2893,14 +2894,14 @@ public HttpResponse getEmployeeOpeningBalancesForHttpResponse(String accessToken
     * @return EmployeePayTemplateObject
     * @throws IOException if an error occurs while attempting to invoke the API
     **/
-    public EmployeePayTemplateObject  getEmployeePayTemplates(String accessToken, String xeroTenantId, UUID employeeId) throws IOException {
+    public EmployeePayTemplateObject  getEmployeePayTemplate(String accessToken, String xeroTenantId, UUID employeeId) throws IOException {
         try {
             TypeReference<EmployeePayTemplateObject> typeRef = new TypeReference<EmployeePayTemplateObject>() {};
-            HttpResponse response = getEmployeePayTemplatesForHttpResponse(accessToken, xeroTenantId, employeeId);
+            HttpResponse response = getEmployeePayTemplateForHttpResponse(accessToken, xeroTenantId, employeeId);
             return apiClient.getObjectMapper().readValue(response.getContent(), typeRef);
         } catch (HttpResponseException e) {
             if (logger.isDebugEnabled()) {
-                logger.debug("------------------ HttpResponseException " + e.getStatusCode() + " : getEmployeePayTemplates -------------------");
+                logger.debug("------------------ HttpResponseException " + e.getStatusCode() + " : getEmployeePayTemplate -------------------");
                 logger.debug(e.toString());
             }
             XeroApiExceptionHandler handler = new XeroApiExceptionHandler();
@@ -2917,16 +2918,16 @@ public EmployeePayTemplateObject  getEmployeePayTemplates(String accessToken, St
         return null;
     }
 
-    public HttpResponse getEmployeePayTemplatesForHttpResponse(String accessToken,  String xeroTenantId,  UUID employeeId) throws IOException {
+    public HttpResponse getEmployeePayTemplateForHttpResponse(String accessToken,  String xeroTenantId,  UUID employeeId) throws IOException {
         // verify the required parameter 'xeroTenantId' is set
         if (xeroTenantId == null) {
-            throw new IllegalArgumentException("Missing the required parameter 'xeroTenantId' when calling getEmployeePayTemplates");
+            throw new IllegalArgumentException("Missing the required parameter 'xeroTenantId' when calling getEmployeePayTemplate");
         }// verify the required parameter 'employeeId' is set
         if (employeeId == null) {
-            throw new IllegalArgumentException("Missing the required parameter 'employeeId' when calling getEmployeePayTemplates");
+            throw new IllegalArgumentException("Missing the required parameter 'employeeId' when calling getEmployeePayTemplate");
         }
         if (accessToken == null) {
-            throw new IllegalArgumentException("Missing the required parameter 'accessToken' when calling getEmployeePayTemplates");
+            throw new IllegalArgumentException("Missing the required parameter 'accessToken' when calling getEmployeePayTemplate");
         }
         HttpHeaders headers = new HttpHeaders();
         headers.set("Xero-Tenant-Id", xeroTenantId);
@@ -5062,12 +5063,12 @@ public HttpResponse updateEmployeeSalaryAndWageForHttpResponse(String accessToke
     * @param payRunID Identifier for the pay run
     * @param payRun The payRun parameter
     * @param accessToken Authorization token for user set in header of each request
-    * @return PayRuns
+    * @return PayRunObject
     * @throws IOException if an error occurs while attempting to invoke the API
     **/
-    public PayRuns  updatePayRun(String accessToken, String xeroTenantId, UUID payRunID, PayRun payRun) throws IOException {
+    public PayRunObject  updatePayRun(String accessToken, String xeroTenantId, UUID payRunID, PayRun payRun) throws IOException {
         try {
-            TypeReference<PayRuns> typeRef = new TypeReference<PayRuns>() {};
+            TypeReference<PayRunObject> typeRef = new TypeReference<PayRunObject>() {};
             HttpResponse response = updatePayRunForHttpResponse(accessToken, xeroTenantId, payRunID, payRun);
             return apiClient.getObjectMapper().readValue(response.getContent(), typeRef);
         } catch (HttpResponseException e) {
@@ -5077,9 +5078,9 @@ public PayRuns  updatePayRun(String accessToken, String xeroTenantId, UUID payRu
             }
             XeroApiExceptionHandler handler = new XeroApiExceptionHandler();
              if (e.getStatusCode() == 400 || e.getStatusCode() == 405) {
-                TypeReference<PayRuns> errorTypeRef = new TypeReference<PayRuns>() {};
-                PayRuns object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef);
-                handler.validationError(e.getStatusCode(),"PayRuns",object.getProblem());
+                TypeReference<PayRunObject> errorTypeRef = new TypeReference<PayRunObject>() {};
+                PayRunObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef);
+                handler.validationError(e.getStatusCode(),"PayRunObject",object.getProblem());
             } else {
                 handler.execute(e);
             }

src/main/java/com/xero/api/client/ProjectApi.java

@@ -54,7 +54,7 @@ public class ProjectApi {
     private ApiClient apiClient;
     private static ProjectApi instance = null;
     private String userAgent = "Default";
-    private String version = "4.0.2";
+    private String version = "4.1.0";
     final static Logger logger = LoggerFactory.getLogger(ProjectApi.class);
 
     public ProjectApi() {
@@ -614,7 +614,7 @@ public HttpResponse getTaskForHttpResponse(String accessToken,  String xeroTenan
     * @param projectId You can specify an individual project by appending the projectId to the endpoint
     * @param page Set to 1 by default. The requested number of the page in paged response - Must be a number greater than 0.
     * @param pageSize Optional, it is set to 50 by default. The number of items to return per page in a paged response - Must be a number between 1 and 500.
-    * @param taskIds taskIds Search for all tasks that match a comma separated list of taskIds, i.e. GET https://.../tasks?taskIds={taskId},{taskId}
+    * @param taskIds taskIdsSearch for all tasks that match a comma separated list of taskIds, i.e. GET https://.../tasks?taskIds={taskId},{taskId}
     * @param accessToken Authorization token for user set in header of each request
     * @return Tasks
     * @throws IOException if an error occurs while attempting to invoke the API
@@ -715,7 +715,7 @@ public HttpResponse getTasksForHttpResponse(String accessToken,  String xeroTena
     * @param contactId Finds all time entries for this contact identifier.
     * @param page Set to 1 by default. The requested number of the page in paged response - Must be a number greater than 0.
     * @param pageSize Optional, it is set to 50 by default. The number of items to return per page in a paged response - Must be a number between 1 and 500.
-    * @param states Comma-separated list of states to find. Will find all time entries that are in the status of whatever’s specified. 
+    * @param states Comma-separated list of states to find. Will find all time entries that are in the status of whatever’s specified.
     * @param isChargeable Finds all time entries which relate to tasks with the charge type `TIME` or `FIXED`.
     * @param dateAfterUtc ISO 8601 UTC date. Finds all time entries on or after this date filtered on the `dateUtc` field.
     * @param dateBeforeUtc ISO 8601 UTC date. Finds all time entries on or before this date filtered on the `dateUtc` field.

src/main/java/com/xero/models/accounting/Account.java

@@ -2,7 +2,7 @@
  * Accounting API
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
- * The version of the OpenAPI document: 2.1.5
+ * The version of the OpenAPI document: 2.2.0
  * Contact: [email protected]
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -15,6 +15,7 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;