diff --git a/pom.xml b/pom.xml index dd9c4f0d..9d2af937 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ xero-java jar xero-java - 4.3.1 + 4.3.2 https://github.com/XeroAPI/Xero-Java This is the official Java SDK for Xero API diff --git a/src/main/java/com/xero/api/XeroApiException.java b/src/main/java/com/xero/api/XeroApiException.java index ee991642..5bb70a1c 100644 --- a/src/main/java/com/xero/api/XeroApiException.java +++ b/src/main/java/com/xero/api/XeroApiException.java @@ -19,8 +19,8 @@ public XeroApiException(int responseCode) { this.responseCode = responseCode; } - public XeroApiException(int responseCode, String message) { - super(responseCode + " response: " + message); + public XeroApiException(int responseCode, String message, Exception e) { + super(responseCode + " response: " + message, e); this.responseCode = responseCode; this.message = message; } @@ -38,14 +38,14 @@ public XeroApiException(int responseCode, Map map) { this.messageMap = map; } - public XeroApiException(int responseCode, Error error) { - super(responseCode + " response: none"); + public XeroApiException(int responseCode, Error error, Exception e) { + super(responseCode + " response: none", e); this.responseCode = responseCode; this.error = error; } - public XeroApiException(int responseCode, String message, Error error) { - super(responseCode + " response: " + message); + public XeroApiException(int responseCode, String message, Error error, Exception e) { + super(responseCode + " response: " + message, e); this.responseCode = responseCode; this.message = message; this.error = error; diff --git a/src/main/java/com/xero/api/XeroApiExceptionHandler.java b/src/main/java/com/xero/api/XeroApiExceptionHandler.java index 09b99af3..1e4ed911 100644 --- a/src/main/java/com/xero/api/XeroApiExceptionHandler.java +++ b/src/main/java/com/xero/api/XeroApiExceptionHandler.java @@ -20,76 +20,76 @@ public XeroApiExceptionHandler() { // REFACTOR ERROR HANDLER // ACCOUNTING Validation Errors (400) - public void validationError(String objectType, com.xero.models.accounting.Error error) { - throw new XeroBadRequestException(objectType, error); + public void validationError(String objectType, com.xero.models.accounting.Error error, Exception e) { + throw new XeroBadRequestException(objectType, error, e); } // ASSETS Validation Errors (400) - public void validationError(String objectType, com.xero.models.assets.Error error) { - throw new XeroBadRequestException(objectType, error); + public void validationError(String objectType, com.xero.models.assets.Error error, Exception e) { + throw new XeroBadRequestException(objectType, error, e); } // BANKFEED Statements Validation Errors (400) - public void validationError(String objectType, Statements error) { - throw new XeroBadRequestException(objectType, error); + public void validationError(String objectType, Statements error, Exception e) { + throw new XeroBadRequestException(objectType, error, e); } // BANKFEED Connections Validation Errors (400) - public void validationError(String objectType, FeedConnections error) { - throw new XeroBadRequestException(objectType, error); + public void validationError(String objectType, FeedConnections error, Exception e) { + throw new XeroBadRequestException(objectType, error, e); } // PAYROLL UK Validation Errors - public void validationError(Integer statusCode, String objectType, com.xero.models.payrolluk.Problem error) { + public void validationError(Integer statusCode, String objectType, com.xero.models.payrolluk.Problem error, Exception e) { if (statusCode == 400 ) { - throw new XeroBadRequestException(objectType, error); + throw new XeroBadRequestException(objectType, error, e); } else if(statusCode == 405) { - throw new XeroMethodNotAllowedException(objectType, error); + throw new XeroMethodNotAllowedException(objectType, error, e); } } // PAYROLL NZ Validation Errors - public void validationError(Integer statusCode, String objectType, com.xero.models.payrollnz.Problem error) { + public void validationError(Integer statusCode, String objectType, com.xero.models.payrollnz.Problem error, Exception e) { if (statusCode == 400 ) { - throw new XeroBadRequestException(objectType, error); + throw new XeroBadRequestException(objectType, error, e); } else if(statusCode == 405) { - throw new XeroMethodNotAllowedException(objectType, error); + throw new XeroMethodNotAllowedException(objectType, error, e); } else if(statusCode == 409) { - throw new XeroConflictException(objectType, error); + throw new XeroConflictException(objectType, error, e); } } // PAYROLL AU Employees Validation Errors (400) - public void validationError(String objectType, com.xero.models.payrollau.Employees employees) { - throw new XeroBadRequestException(objectType, employees); + public void validationError(String objectType, com.xero.models.payrollau.Employees employees, Exception e) { + throw new XeroBadRequestException(objectType, employees, e); } - public void validationError(String objectType, com.xero.models.payrollau.LeaveApplications leaveApplications) { - throw new XeroBadRequestException(objectType, leaveApplications); + public void validationError(String objectType, com.xero.models.payrollau.LeaveApplications leaveApplications, Exception e) { + throw new XeroBadRequestException(objectType, leaveApplications, e); } - public void validationError(String objectType, com.xero.models.payrollau.PayItems payItems) { - throw new XeroBadRequestException(objectType, payItems); + public void validationError(String objectType, com.xero.models.payrollau.PayItems payItems, Exception e) { + throw new XeroBadRequestException(objectType, payItems, e); } - public void validationError(String objectType, com.xero.models.payrollau.PayRuns payRuns) { - throw new XeroBadRequestException(objectType, payRuns); + public void validationError(String objectType, com.xero.models.payrollau.PayRuns payRuns, Exception e) { + throw new XeroBadRequestException(objectType, payRuns, e); } - public void validationError(String objectType, com.xero.models.payrollau.PayrollCalendars payrollCalendars) { - throw new XeroBadRequestException(objectType, payrollCalendars); + public void validationError(String objectType, com.xero.models.payrollau.PayrollCalendars payrollCalendars, Exception e) { + throw new XeroBadRequestException(objectType, payrollCalendars, e); } - public void validationError(String objectType, com.xero.models.payrollau.SuperFunds superFunds) { - throw new XeroBadRequestException(objectType, superFunds); + public void validationError(String objectType, com.xero.models.payrollau.SuperFunds superFunds, Exception e) { + throw new XeroBadRequestException(objectType, superFunds, e); } - public void validationError(String objectType, com.xero.models.payrollau.Timesheets timesheets) { - throw new XeroBadRequestException(objectType, timesheets); + public void validationError(String objectType, com.xero.models.payrollau.Timesheets timesheets, Exception e) { + throw new XeroBadRequestException(objectType, timesheets, e); } - public void validationError(String objectType, String msg) { - throw new XeroBadRequestException(400, msg); + public void validationError(String objectType, String msg, Exception e) { + throw new XeroBadRequestException(400, msg, e); } // REFACTOR GENERIC ERROR HANDLER @@ -98,34 +98,34 @@ public void execute(HttpResponseException e) { if (statusCode == 400) { String message = e.getMessage(); - throw new XeroBadRequestException(statusCode,message); - + throw new XeroBadRequestException(statusCode, message, e); + } else if (statusCode == 401) { String message = "Unauthorized - check your scopes and confirm access to this resource"; - throw new XeroUnauthorizedException(statusCode, message); + throw new XeroUnauthorizedException(statusCode, message, e); } else if (statusCode == 403) { String message = "Forbidden - authentication unsuccessful"; - throw new XeroForbiddenException(statusCode, message); + throw new XeroForbiddenException(statusCode, message, e); } else if (statusCode == 404) { String message = "The resource you're looking for cannot be found"; - throw new XeroNotFoundException(statusCode, message); + throw new XeroNotFoundException(statusCode, message, e); } else if (statusCode == 429) { String message = "You've exceeded the per " + e.getHeaders().get("x-rate-limit-problem") + " rate limit"; - throw new XeroRateLimitException(statusCode, message); + throw new XeroRateLimitException(statusCode, message, e); } else if (statusCode == 500) { String message = "An error occurred in Xero. Check the API Status page http://status.developer.xero.com for current service status."; - throw new XeroServerErrorException(statusCode, message); + throw new XeroServerErrorException(statusCode, message, e); } else if (statusCode > 500) { String message = "Internal Server Error"; - throw new XeroServerErrorException(statusCode, message); + throw new XeroServerErrorException(statusCode, message, e); } else { - throw new XeroApiException(statusCode, e.getStatusMessage()); + throw new XeroApiException(statusCode, e.getStatusMessage(), e); } } @@ -139,7 +139,7 @@ public void execute(HttpResponseException e, ApiClient apiClient) TypeReference errorTypeRef = new TypeReference() { }; error = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - throw new XeroApiException(statusCode, e.getStatusMessage(), error); + throw new XeroApiException(statusCode, e.getStatusMessage(), error, e); } else if (statusCode == 404) { error = new Error(); Element elementsItem = new Element(); @@ -147,7 +147,7 @@ public void execute(HttpResponseException e, ApiClient apiClient) ve.setMessage("The resource you're looking for cannot be found"); elementsItem.addValidationErrorsItem(ve); error.addElementsItem(elementsItem); - throw new XeroApiException(statusCode, error); + throw new XeroApiException(statusCode, error, e); } else if (statusCode == 429) { error = new Error(); Element elementsItem = new Element(); @@ -155,11 +155,11 @@ public void execute(HttpResponseException e, ApiClient apiClient) ve.setMessage("You've exceeded the per " + e.getHeaders().get("x-rate-limit-problem") + " rate limit"); elementsItem.addValidationErrorsItem(ve); error.addElementsItem(elementsItem); - throw new XeroApiException(statusCode, error); + throw new XeroApiException(statusCode, error, e); } else if (statusCode == 401) { - throw new XeroApiException(401, "Unauthorized - check your scopes and confirm access to this resource" ); + throw new XeroApiException(statusCode, "Unauthorized - check your scopes and confirm access to this resource", e); } else if (statusCode != 400) { - throw new XeroApiException(statusCode, e.getStatusMessage()); + throw new XeroApiException(statusCode, e.getStatusMessage(), e); } else { throw e; } diff --git a/src/main/java/com/xero/api/XeroAuthenticationException.java b/src/main/java/com/xero/api/XeroAuthenticationException.java index c1c09cea..d01e5243 100644 --- a/src/main/java/com/xero/api/XeroAuthenticationException.java +++ b/src/main/java/com/xero/api/XeroAuthenticationException.java @@ -6,7 +6,7 @@ public class XeroAuthenticationException extends XeroException { private static final long serialVersionUID = -6292824871010327632L; - public XeroAuthenticationException(final String message) { - super(message); + public XeroAuthenticationException(final String message, final Exception e) { + super(message, e); } } diff --git a/src/main/java/com/xero/api/XeroBadRequestException.java b/src/main/java/com/xero/api/XeroBadRequestException.java index fe8891f9..f0608a68 100644 --- a/src/main/java/com/xero/api/XeroBadRequestException.java +++ b/src/main/java/com/xero/api/XeroBadRequestException.java @@ -1,5 +1,6 @@ package com.xero.api; +import com.xero.models.payrollau.Timesheets; import java.util.ArrayList; import java.util.List; import java.util.Objects; @@ -34,79 +35,91 @@ public class XeroBadRequestException extends XeroException { private List timesheetItems = new ArrayList(); private List payRunItems = new ArrayList(); - public XeroBadRequestException(String objectType, com.xero.models.accounting.Error error) { + public XeroBadRequestException(String objectType, com.xero.models.accounting.Error error, Exception e) { + super(e); this.statusCode = 400; this.type(objectType); this.elements(error.getElements()); } - public XeroBadRequestException(String objectType, com.xero.models.assets.Error error) { + public XeroBadRequestException(String objectType, com.xero.models.assets.Error error, Exception e) { + super(e); this.statusCode = 400; this.type = objectType; this.fieldValidationErrorsElements = error.getFieldValidationErrors(); } - public XeroBadRequestException(String objectType, Statements error) { + public XeroBadRequestException(String objectType, Statements error, Exception e) { + super(e); this.statusCode = 400; this.type = objectType; this.statementItems = error.getItems(); } - public XeroBadRequestException(String objectType, FeedConnections error) { + public XeroBadRequestException(String objectType, FeedConnections error, Exception e) { + super(e); this.statusCode = 400; this.type = objectType; this.feedConnectionItems = error.getItems(); } - public XeroBadRequestException(String objectType, com.xero.models.payrolluk.Problem problem) { + public XeroBadRequestException(String objectType, com.xero.models.payrolluk.Problem problem, Exception e) { + super(e); this.statusCode = 400; this.type = objectType; this.payrollUkProblem = problem; } - public XeroBadRequestException(String objectType, com.xero.models.payrollnz.Problem problem) { + public XeroBadRequestException(String objectType, com.xero.models.payrollnz.Problem problem, Exception e) { + super(e); this.statusCode = 400; this.type = objectType; this.payrollNzProblem = problem; } - - public XeroBadRequestException(String objectType, com.xero.models.payrollau.Employees employees) { + + public XeroBadRequestException(String objectType, com.xero.models.payrollau.Employees employees, Exception e) { + super(e); this.statusCode = 400; this.type = objectType; this.employeeItems = employees.getEmployees(); } - public XeroBadRequestException(String objectType, com.xero.models.payrollau.LeaveApplications leaveApplications) { + public XeroBadRequestException(String objectType, com.xero.models.payrollau.LeaveApplications leaveApplications, Exception e) { + super(e); this.statusCode = 400; this.type = objectType; this.leaveApplicationItems = leaveApplications.getLeaveApplications(); } - public XeroBadRequestException(String objectType, com.xero.models.payrollau.PayItems payItems) { + public XeroBadRequestException(String objectType, com.xero.models.payrollau.PayItems payItems, Exception e) { + super(e); this.statusCode = 400; this.type = objectType; //this.payItemItems = payItems.g } - public XeroBadRequestException(String objectType, com.xero.models.payrollau.PayrollCalendars payrollCalendars) { + public XeroBadRequestException(String objectType, com.xero.models.payrollau.PayrollCalendars payrollCalendars, Exception e) { + super(e); this.statusCode = 400; this.type = objectType; this.payrollCalendarItems = payrollCalendars.getPayrollCalendars(); } - public XeroBadRequestException(String objectType, com.xero.models.payrollau.SuperFunds superFunds) { + public XeroBadRequestException(String objectType, com.xero.models.payrollau.SuperFunds superFunds, Exception e) { this.statusCode = 400; this.type = objectType; this.superFundItems = superFunds.getSuperFunds(); } - public XeroBadRequestException(String objectType, com.xero.models.payrollau.Timesheets timesheets) { + public XeroBadRequestException(String objectType, com.xero.models.payrollau.Timesheets timesheets, Exception e) { + super(e); this.statusCode = 400; this.type = objectType; this.timesheetItems = timesheets.getTimesheets(); } - public XeroBadRequestException(String objectType, com.xero.models.payrollau.PayRuns payRuns) { + public XeroBadRequestException(String objectType, com.xero.models.payrollau.PayRuns payRuns, Exception e) { + super(e); this.statusCode = 400; this.type = objectType; this.payRunItems = payRuns.getPayRuns(); @@ -116,7 +129,13 @@ public XeroBadRequestException(Integer statusCode, String message) { this.statusCode = statusCode; this.message = message; } - + + public XeroBadRequestException(Integer statusCode, String message, Exception e) { + super(message, e); + this.statusCode = statusCode; + this.message = message; + } + public XeroBadRequestException statusCode(Integer statusCode) { this.statusCode = statusCode; return this; @@ -304,7 +323,7 @@ public XeroBadRequestException payrollNzProblem(com.xero.models.payrollnz.Proble this.payrollNzProblem = problem; return this; } - + /** * Exception type * @return com.xero.models.payrollnz.Problem @@ -313,11 +332,11 @@ public XeroBadRequestException payrollNzProblem(com.xero.models.payrollnz.Proble public com.xero.models.payrollnz.Problem getPayrollNzProblem() { return payrollNzProblem; } - + public void setPayrollNzProblem(com.xero.models.payrollnz.Problem problem) { this.payrollNzProblem = problem; } - + // Payroll AU Employees public XeroBadRequestException employeeItemsItems(List employeeItems) { diff --git a/src/main/java/com/xero/api/XeroConflictException.java b/src/main/java/com/xero/api/XeroConflictException.java index 6aad8862..c1c3bc0b 100644 --- a/src/main/java/com/xero/api/XeroConflictException.java +++ b/src/main/java/com/xero/api/XeroConflictException.java @@ -58,7 +58,8 @@ public XeroConflictException(String objectType, com.xero.models.payrolluk.Proble this.payrollUkProblem = problem; } - public XeroConflictException(String objectType, com.xero.models.payrollnz.Problem problem) { + public XeroConflictException(String objectType, com.xero.models.payrollnz.Problem problem, Exception e) { + super(e); this.statusCode = 409; this.type = objectType; this.payrollNzProblem = problem; diff --git a/src/main/java/com/xero/api/XeroException.java b/src/main/java/com/xero/api/XeroException.java index 0b8cc325..582d668f 100644 --- a/src/main/java/com/xero/api/XeroException.java +++ b/src/main/java/com/xero/api/XeroException.java @@ -10,8 +10,15 @@ public class XeroException extends RuntimeException { public XeroException() { } + public XeroException(final Throwable cause) { + super(cause); + } + public XeroException(final String message) { super(message); } + public XeroException(final String message, final Throwable cause) { + super(message, cause); + } } diff --git a/src/main/java/com/xero/api/XeroForbiddenException.java b/src/main/java/com/xero/api/XeroForbiddenException.java index 3c11455d..5e471963 100644 --- a/src/main/java/com/xero/api/XeroForbiddenException.java +++ b/src/main/java/com/xero/api/XeroForbiddenException.java @@ -6,8 +6,8 @@ public class XeroForbiddenException extends XeroAuthenticationException { private int statusCode = 0; private String message; - public XeroForbiddenException(int statusCode, String message) { - super(statusCode + " : " + message); + public XeroForbiddenException(int statusCode, String message, Exception e) { + super(statusCode + " : " + message, e); this.statusCode = statusCode; this.message = message; } diff --git a/src/main/java/com/xero/api/XeroMethodNotAllowedException.java b/src/main/java/com/xero/api/XeroMethodNotAllowedException.java index d875c846..e0d5cf8d 100644 --- a/src/main/java/com/xero/api/XeroMethodNotAllowedException.java +++ b/src/main/java/com/xero/api/XeroMethodNotAllowedException.java @@ -1,10 +1,10 @@ package com.xero.api; +import com.xero.models.payrolluk.Problem; import java.util.ArrayList; import java.util.List; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; import com.xero.models.accounting.Element; import com.xero.models.assets.FieldValidationErrorsElement; import com.xero.models.bankfeeds.FeedConnection; @@ -52,13 +52,15 @@ public XeroMethodNotAllowedException(String objectType, FeedConnections error) { this.feedConnectionItems = error.getItems(); } - public XeroMethodNotAllowedException(String objectType, com.xero.models.payrolluk.Problem problem) { + public XeroMethodNotAllowedException(String objectType, com.xero.models.payrolluk.Problem problem, Exception e) { + super(e); this.statusCode = 405; this.type = objectType; this.payrollUkProblem = problem; } - public XeroMethodNotAllowedException(String objectType, com.xero.models.payrollnz.Problem problem) { + public XeroMethodNotAllowedException(String objectType, com.xero.models.payrollnz.Problem problem, Exception e) { + super(e); this.statusCode = 405; this.type = objectType; this.payrollNzProblem = problem; diff --git a/src/main/java/com/xero/api/XeroNotFoundException.java b/src/main/java/com/xero/api/XeroNotFoundException.java index 49a03c9b..9ffc08b4 100644 --- a/src/main/java/com/xero/api/XeroNotFoundException.java +++ b/src/main/java/com/xero/api/XeroNotFoundException.java @@ -6,8 +6,8 @@ public class XeroNotFoundException extends XeroException { private int statusCode = 0; private String message; - public XeroNotFoundException(int statusCode, String message) { - super(statusCode + " : " + message); + public XeroNotFoundException(int statusCode, String message, Exception e) { + super(statusCode + " : " + message, e); this.statusCode = statusCode; this.message = message; } diff --git a/src/main/java/com/xero/api/XeroRateLimitException.java b/src/main/java/com/xero/api/XeroRateLimitException.java index b0342015..27a217e3 100644 --- a/src/main/java/com/xero/api/XeroRateLimitException.java +++ b/src/main/java/com/xero/api/XeroRateLimitException.java @@ -6,8 +6,8 @@ public class XeroRateLimitException extends XeroException { private int statusCode = 0; private String message; - public XeroRateLimitException(int statusCode, String message) { - super(statusCode + " : " + message); + public XeroRateLimitException(int statusCode, String message, Exception e) { + super(statusCode + " : " + message, e); this.statusCode = statusCode; this.message = message; } diff --git a/src/main/java/com/xero/api/XeroServerErrorException.java b/src/main/java/com/xero/api/XeroServerErrorException.java index 4072db4c..d5df0a90 100644 --- a/src/main/java/com/xero/api/XeroServerErrorException.java +++ b/src/main/java/com/xero/api/XeroServerErrorException.java @@ -6,8 +6,8 @@ public class XeroServerErrorException extends XeroException { private int statusCode = 0; private String message; - public XeroServerErrorException(int statusCode, String message) { - super(statusCode + " : " + message); + public XeroServerErrorException(int statusCode, String message, Exception e) { + super(statusCode + " : " + message, e); this.statusCode = statusCode; this.message = message; } diff --git a/src/main/java/com/xero/api/XeroUnauthorizedException.java b/src/main/java/com/xero/api/XeroUnauthorizedException.java index fd1f69fa..8ebbee09 100644 --- a/src/main/java/com/xero/api/XeroUnauthorizedException.java +++ b/src/main/java/com/xero/api/XeroUnauthorizedException.java @@ -6,8 +6,8 @@ public class XeroUnauthorizedException extends XeroAuthenticationException { private int statusCode = 0; private String message; - public XeroUnauthorizedException(int statusCode, String message) { - super(statusCode + " : " + message); + public XeroUnauthorizedException(int statusCode, String message, Exception e) { + super(statusCode + " : " + message, e); this.statusCode = statusCode; this.message = message; } diff --git a/src/main/java/com/xero/api/client/AccountingApi.java b/src/main/java/com/xero/api/client/AccountingApi.java index 84620d72..b71b77ce 100644 --- a/src/main/java/com/xero/api/client/AccountingApi.java +++ b/src/main/java/com/xero/api/client/AccountingApi.java @@ -83,7 +83,7 @@ public class AccountingApi { private ApiClient apiClient; private static AccountingApi instance = null; private String userAgent = "Default"; - private String version = "4.3.1"; + private String version = "4.3.2"; static final Logger logger = LoggerFactory.getLogger(AccountingApi.class); public AccountingApi() { @@ -152,9 +152,9 @@ public Accounts createAccount(String accessToken, String xeroTenantId, Account a com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("Accounts", object.getMessage()); + handler.validationError("Accounts", object.getMessage(), e); } - handler.validationError("Accounts", object); + handler.validationError("Accounts", object, e); } else { handler.execute(e); } @@ -358,9 +358,9 @@ public Attachments createAccountAttachmentByFileName( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("Attachments", object.getMessage()); + handler.validationError("Attachments", object.getMessage(), e); } - handler.validationError("Attachments", object); + handler.validationError("Attachments", object, e); } else { handler.execute(e); } @@ -586,9 +586,9 @@ public Attachments createBankTransactionAttachmentByFileName( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("Attachments", object.getMessage()); + handler.validationError("Attachments", object.getMessage(), e); } - handler.validationError("Attachments", object); + handler.validationError("Attachments", object, e); } else { handler.execute(e); } @@ -703,9 +703,9 @@ public HistoryRecords createBankTransactionHistoryRecord( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("HistoryRecords", object.getMessage()); + handler.validationError("HistoryRecords", object.getMessage(), e); } - handler.validationError("HistoryRecords", object); + handler.validationError("HistoryRecords", object, e); } else { handler.execute(e); } @@ -821,9 +821,9 @@ public BankTransactions createBankTransactions( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("BankTransactions", object.getMessage()); + handler.validationError("BankTransactions", object.getMessage(), e); } - handler.validationError("BankTransactions", object); + handler.validationError("BankTransactions", object, e); } else { handler.execute(e); } @@ -936,9 +936,9 @@ public BankTransfers createBankTransfer( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("BankTransfers", object.getMessage()); + handler.validationError("BankTransfers", object.getMessage(), e); } - handler.validationError("BankTransfers", object); + handler.validationError("BankTransfers", object, e); } else { handler.execute(e); } @@ -1141,9 +1141,9 @@ public Attachments createBankTransferAttachmentByFileName( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("Attachments", object.getMessage()); + handler.validationError("Attachments", object.getMessage(), e); } - handler.validationError("Attachments", object); + handler.validationError("Attachments", object, e); } else { handler.execute(e); } @@ -1252,9 +1252,9 @@ public HistoryRecords createBankTransferHistoryRecord( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("HistoryRecords", object.getMessage()); + handler.validationError("HistoryRecords", object.getMessage(), e); } - handler.validationError("HistoryRecords", object); + handler.validationError("HistoryRecords", object, e); } else { handler.execute(e); } @@ -1358,9 +1358,9 @@ public BatchPayments createBatchPayment( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("BatchPayments", object.getMessage()); + handler.validationError("BatchPayments", object.getMessage(), e); } - handler.validationError("BatchPayments", object); + handler.validationError("BatchPayments", object, e); } else { handler.execute(e); } @@ -1462,9 +1462,9 @@ public HistoryRecords createBatchPaymentHistoryRecord( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("HistoryRecords", object.getMessage()); + handler.validationError("HistoryRecords", object.getMessage(), e); } - handler.validationError("HistoryRecords", object); + handler.validationError("HistoryRecords", object, e); } else { handler.execute(e); } @@ -1568,9 +1568,9 @@ public PaymentServices createBrandingThemePaymentServices( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("PaymentServices", object.getMessage()); + handler.validationError("PaymentServices", object.getMessage(), e); } - handler.validationError("PaymentServices", object); + handler.validationError("PaymentServices", object, e); } else { handler.execute(e); } @@ -1787,9 +1787,9 @@ public Attachments createContactAttachmentByFileName( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("Attachments", object.getMessage()); + handler.validationError("Attachments", object.getMessage(), e); } - handler.validationError("Attachments", object); + handler.validationError("Attachments", object, e); } else { handler.execute(e); } @@ -1896,9 +1896,9 @@ public ContactGroups createContactGroup( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("ContactGroups", object.getMessage()); + handler.validationError("ContactGroups", object.getMessage(), e); } - handler.validationError("ContactGroups", object); + handler.validationError("ContactGroups", object, e); } else { handler.execute(e); } @@ -1988,9 +1988,9 @@ public Contacts createContactGroupContacts( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("Contacts", object.getMessage()); + handler.validationError("Contacts", object.getMessage(), e); } - handler.validationError("Contacts", object); + handler.validationError("Contacts", object, e); } else { handler.execute(e); } @@ -2090,9 +2090,9 @@ public HistoryRecords createContactHistory( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("HistoryRecords", object.getMessage()); + handler.validationError("HistoryRecords", object.getMessage(), e); } - handler.validationError("HistoryRecords", object); + handler.validationError("HistoryRecords", object, e); } else { handler.execute(e); } @@ -2191,9 +2191,9 @@ public Contacts createContacts( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("Contacts", object.getMessage()); + handler.validationError("Contacts", object.getMessage(), e); } - handler.validationError("Contacts", object); + handler.validationError("Contacts", object, e); } else { handler.execute(e); } @@ -2301,9 +2301,9 @@ public Allocations createCreditNoteAllocation( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("Allocations", object.getMessage()); + handler.validationError("Allocations", object.getMessage(), e); } - handler.validationError("Allocations", object); + handler.validationError("Allocations", object, e); } else { handler.execute(e); } @@ -2557,9 +2557,9 @@ public Attachments createCreditNoteAttachmentByFileName( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("Attachments", object.getMessage()); + handler.validationError("Attachments", object.getMessage(), e); } - handler.validationError("Attachments", object); + handler.validationError("Attachments", object, e); } else { handler.execute(e); } @@ -2686,9 +2686,9 @@ public HistoryRecords createCreditNoteHistory( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("HistoryRecords", object.getMessage()); + handler.validationError("HistoryRecords", object.getMessage(), e); } - handler.validationError("HistoryRecords", object); + handler.validationError("HistoryRecords", object, e); } else { handler.execute(e); } @@ -2795,9 +2795,9 @@ public CreditNotes createCreditNotes( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("CreditNotes", object.getMessage()); + handler.validationError("CreditNotes", object.getMessage(), e); } - handler.validationError("CreditNotes", object); + handler.validationError("CreditNotes", object, e); } else { handler.execute(e); } @@ -2906,9 +2906,9 @@ public Currencies createCurrency(String accessToken, String xeroTenantId, Curren com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("Currencies", object.getMessage()); + handler.validationError("Currencies", object.getMessage(), e); } - handler.validationError("Currencies", object); + handler.validationError("Currencies", object, e); } else { handler.execute(e); } @@ -2997,9 +2997,9 @@ public Employees createEmployees( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("Employees", object.getMessage()); + handler.validationError("Employees", object.getMessage(), e); } - handler.validationError("Employees", object); + handler.validationError("Employees", object, e); } else { handler.execute(e); } @@ -3099,9 +3099,9 @@ public HistoryRecords createExpenseClaimHistory( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("HistoryRecords", object.getMessage()); + handler.validationError("HistoryRecords", object.getMessage(), e); } - handler.validationError("HistoryRecords", object); + handler.validationError("HistoryRecords", object, e); } else { handler.execute(e); } @@ -3198,9 +3198,9 @@ public ExpenseClaims createExpenseClaims( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("ExpenseClaims", object.getMessage()); + handler.validationError("ExpenseClaims", object.getMessage(), e); } - handler.validationError("ExpenseClaims", object); + handler.validationError("ExpenseClaims", object, e); } else { handler.execute(e); } @@ -3428,9 +3428,9 @@ public Attachments createInvoiceAttachmentByFileName( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("Attachments", object.getMessage()); + handler.validationError("Attachments", object.getMessage(), e); } - handler.validationError("Attachments", object); + handler.validationError("Attachments", object, e); } else { handler.execute(e); } @@ -3555,9 +3555,9 @@ public HistoryRecords createInvoiceHistory( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("HistoryRecords", object.getMessage()); + handler.validationError("HistoryRecords", object.getMessage(), e); } - handler.validationError("HistoryRecords", object); + handler.validationError("HistoryRecords", object, e); } else { handler.execute(e); } @@ -3663,9 +3663,9 @@ public Invoices createInvoices( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("Invoices", object.getMessage()); + handler.validationError("Invoices", object.getMessage(), e); } - handler.validationError("Invoices", object); + handler.validationError("Invoices", object, e); } else { handler.execute(e); } @@ -3779,9 +3779,9 @@ public HistoryRecords createItemHistory( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("HistoryRecords", object.getMessage()); + handler.validationError("HistoryRecords", object.getMessage(), e); } - handler.validationError("HistoryRecords", object); + handler.validationError("HistoryRecords", object, e); } else { handler.execute(e); } @@ -3881,9 +3881,9 @@ public Items createItems( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("Items", object.getMessage()); + handler.validationError("Items", object.getMessage(), e); } - handler.validationError("Items", object); + handler.validationError("Items", object, e); } else { handler.execute(e); } @@ -3994,9 +3994,9 @@ public LinkedTransactions createLinkedTransaction( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("LinkedTransactions", object.getMessage()); + handler.validationError("LinkedTransactions", object.getMessage(), e); } - handler.validationError("LinkedTransactions", object); + handler.validationError("LinkedTransactions", object, e); } else { handler.execute(e); } @@ -4205,9 +4205,9 @@ public Attachments createManualJournalAttachmentByFileName( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("Attachments", object.getMessage()); + handler.validationError("Attachments", object.getMessage(), e); } - handler.validationError("Attachments", object); + handler.validationError("Attachments", object, e); } else { handler.execute(e); } @@ -4322,9 +4322,9 @@ public ManualJournals createManualJournals( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("ManualJournals", object.getMessage()); + handler.validationError("ManualJournals", object.getMessage(), e); } - handler.validationError("ManualJournals", object); + handler.validationError("ManualJournals", object, e); } else { handler.execute(e); } @@ -4435,9 +4435,9 @@ public Allocations createOverpaymentAllocations( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("Allocations", object.getMessage()); + handler.validationError("Allocations", object.getMessage(), e); } - handler.validationError("Allocations", object); + handler.validationError("Allocations", object, e); } else { handler.execute(e); } @@ -4555,9 +4555,9 @@ public HistoryRecords createOverpaymentHistory( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("HistoryRecords", object.getMessage()); + handler.validationError("HistoryRecords", object.getMessage(), e); } - handler.validationError("HistoryRecords", object); + handler.validationError("HistoryRecords", object, e); } else { handler.execute(e); } @@ -4652,9 +4652,9 @@ public Payments createPayment(String accessToken, String xeroTenantId, Payment p com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("Payments", object.getMessage()); + handler.validationError("Payments", object.getMessage(), e); } - handler.validationError("Payments", object); + handler.validationError("Payments", object, e); } else { handler.execute(e); } @@ -4744,9 +4744,9 @@ public HistoryRecords createPaymentHistory( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("HistoryRecords", object.getMessage()); + handler.validationError("HistoryRecords", object.getMessage(), e); } - handler.validationError("HistoryRecords", object); + handler.validationError("HistoryRecords", object, e); } else { handler.execute(e); } @@ -4843,9 +4843,9 @@ public PaymentServices createPaymentService( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("PaymentServices", object.getMessage()); + handler.validationError("PaymentServices", object.getMessage(), e); } - handler.validationError("PaymentServices", object); + handler.validationError("PaymentServices", object, e); } else { handler.execute(e); } @@ -4934,9 +4934,9 @@ public Payments createPayments( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("Payments", object.getMessage()); + handler.validationError("Payments", object.getMessage(), e); } - handler.validationError("Payments", object); + handler.validationError("Payments", object, e); } else { handler.execute(e); } @@ -5044,9 +5044,9 @@ public Allocations createPrepaymentAllocations( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("Allocations", object.getMessage()); + handler.validationError("Allocations", object.getMessage(), e); } - handler.validationError("Allocations", object); + handler.validationError("Allocations", object, e); } else { handler.execute(e); } @@ -5162,9 +5162,9 @@ public HistoryRecords createPrepaymentHistory( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("HistoryRecords", object.getMessage()); + handler.validationError("HistoryRecords", object.getMessage(), e); } - handler.validationError("HistoryRecords", object); + handler.validationError("HistoryRecords", object, e); } else { handler.execute(e); } @@ -5264,9 +5264,9 @@ public HistoryRecords createPurchaseOrderHistory( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("HistoryRecords", object.getMessage()); + handler.validationError("HistoryRecords", object.getMessage(), e); } - handler.validationError("HistoryRecords", object); + handler.validationError("HistoryRecords", object, e); } else { handler.execute(e); } @@ -5372,9 +5372,9 @@ public PurchaseOrders createPurchaseOrders( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("PurchaseOrders", object.getMessage()); + handler.validationError("PurchaseOrders", object.getMessage(), e); } - handler.validationError("PurchaseOrders", object); + handler.validationError("PurchaseOrders", object, e); } else { handler.execute(e); } @@ -5590,9 +5590,9 @@ public Attachments createQuoteAttachmentByFileName( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("Attachments", object.getMessage()); + handler.validationError("Attachments", object.getMessage(), e); } - handler.validationError("Attachments", object); + handler.validationError("Attachments", object, e); } else { handler.execute(e); } @@ -5698,9 +5698,9 @@ public HistoryRecords createQuoteHistory( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("HistoryRecords", object.getMessage()); + handler.validationError("HistoryRecords", object.getMessage(), e); } - handler.validationError("HistoryRecords", object); + handler.validationError("HistoryRecords", object, e); } else { handler.execute(e); } @@ -5799,9 +5799,9 @@ public Quotes createQuotes( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("Quotes", object.getMessage()); + handler.validationError("Quotes", object.getMessage(), e); } - handler.validationError("Quotes", object); + handler.validationError("Quotes", object, e); } else { handler.execute(e); } @@ -5902,9 +5902,9 @@ public Receipts createReceipt( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("Receipts", object.getMessage()); + handler.validationError("Receipts", object.getMessage(), e); } - handler.validationError("Receipts", object); + handler.validationError("Receipts", object, e); } else { handler.execute(e); } @@ -6122,9 +6122,9 @@ public Attachments createReceiptAttachmentByFileName( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("Attachments", object.getMessage()); + handler.validationError("Attachments", object.getMessage(), e); } - handler.validationError("Attachments", object); + handler.validationError("Attachments", object, e); } else { handler.execute(e); } @@ -6234,9 +6234,9 @@ public HistoryRecords createReceiptHistory( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("HistoryRecords", object.getMessage()); + handler.validationError("HistoryRecords", object.getMessage(), e); } - handler.validationError("HistoryRecords", object); + handler.validationError("HistoryRecords", object, e); } else { handler.execute(e); } @@ -6454,9 +6454,9 @@ public Attachments createRepeatingInvoiceAttachmentByFileName( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("Attachments", object.getMessage()); + handler.validationError("Attachments", object.getMessage(), e); } - handler.validationError("Attachments", object); + handler.validationError("Attachments", object, e); } else { handler.execute(e); } @@ -6571,9 +6571,9 @@ public HistoryRecords createRepeatingInvoiceHistory( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("HistoryRecords", object.getMessage()); + handler.validationError("HistoryRecords", object.getMessage(), e); } - handler.validationError("HistoryRecords", object); + handler.validationError("HistoryRecords", object, e); } else { handler.execute(e); } @@ -6676,9 +6676,9 @@ public TaxRates createTaxRates(String accessToken, String xeroTenantId, TaxRates com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("TaxRates", object.getMessage()); + handler.validationError("TaxRates", object.getMessage(), e); } - handler.validationError("TaxRates", object); + handler.validationError("TaxRates", object, e); } else { handler.execute(e); } @@ -6766,9 +6766,9 @@ public TrackingCategories createTrackingCategory( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("TrackingCategories", object.getMessage()); + handler.validationError("TrackingCategories", object.getMessage(), e); } - handler.validationError("TrackingCategories", object); + handler.validationError("TrackingCategories", object, e); } else { handler.execute(e); } @@ -6862,9 +6862,9 @@ public TrackingOptions createTrackingOptions( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("TrackingOptions", object.getMessage()); + handler.validationError("TrackingOptions", object.getMessage(), e); } - handler.validationError("TrackingOptions", object); + handler.validationError("TrackingOptions", object, e); } else { handler.execute(e); } @@ -6964,9 +6964,9 @@ public Accounts deleteAccount(String accessToken, String xeroTenantId, UUID acco com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("Accounts", object.getMessage()); + handler.validationError("Accounts", object.getMessage(), e); } - handler.validationError("Accounts", object); + handler.validationError("Accounts", object, e); } else { handler.execute(e); } @@ -7364,9 +7364,9 @@ public Payments deletePayment( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("Payments", object.getMessage()); + handler.validationError("Payments", object.getMessage(), e); } - handler.validationError("Payments", object); + handler.validationError("Payments", object, e); } else { handler.execute(e); } @@ -7633,9 +7633,9 @@ public void emailInvoice( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("", object.getMessage()); + handler.validationError("", object.getMessage(), e); } - handler.validationError("", object); + handler.validationError("", object, e); } else { handler.execute(e); } @@ -10066,9 +10066,9 @@ public Attachments getContactAttachments(String accessToken, String xeroTenantId com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("Attachments", object.getMessage()); + handler.validationError("Attachments", object.getMessage(), e); } - handler.validationError("Attachments", object); + handler.validationError("Attachments", object, e); } else { handler.execute(e); } @@ -19218,9 +19218,9 @@ public Accounts updateAccount( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("Accounts", object.getMessage()); + handler.validationError("Accounts", object.getMessage(), e); } - handler.validationError("Accounts", object); + handler.validationError("Accounts", object, e); } else { handler.execute(e); } @@ -19433,9 +19433,9 @@ public Attachments updateAccountAttachmentByFileName( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("Attachments", object.getMessage()); + handler.validationError("Attachments", object.getMessage(), e); } - handler.validationError("Attachments", object); + handler.validationError("Attachments", object, e); } else { handler.execute(e); } @@ -19551,9 +19551,9 @@ public BankTransactions updateBankTransaction( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("BankTransactions", object.getMessage()); + handler.validationError("BankTransactions", object.getMessage(), e); } - handler.validationError("BankTransactions", object); + handler.validationError("BankTransactions", object, e); } else { handler.execute(e); } @@ -19784,9 +19784,9 @@ public Attachments updateBankTransactionAttachmentByFileName( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("Attachments", object.getMessage()); + handler.validationError("Attachments", object.getMessage(), e); } - handler.validationError("Attachments", object); + handler.validationError("Attachments", object, e); } else { handler.execute(e); } @@ -20011,9 +20011,9 @@ public Attachments updateBankTransferAttachmentByFileName( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("Attachments", object.getMessage()); + handler.validationError("Attachments", object.getMessage(), e); } - handler.validationError("Attachments", object); + handler.validationError("Attachments", object, e); } else { handler.execute(e); } @@ -20120,9 +20120,9 @@ public Contacts updateContact( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("Contacts", object.getMessage()); + handler.validationError("Contacts", object.getMessage(), e); } - handler.validationError("Contacts", object); + handler.validationError("Contacts", object, e); } else { handler.execute(e); } @@ -20331,9 +20331,9 @@ public Attachments updateContactAttachmentByFileName( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("Attachments", object.getMessage()); + handler.validationError("Attachments", object.getMessage(), e); } - handler.validationError("Attachments", object); + handler.validationError("Attachments", object, e); } else { handler.execute(e); } @@ -20442,9 +20442,9 @@ public ContactGroups updateContactGroup( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("ContactGroups", object.getMessage()); + handler.validationError("ContactGroups", object.getMessage(), e); } - handler.validationError("ContactGroups", object); + handler.validationError("ContactGroups", object, e); } else { handler.execute(e); } @@ -20549,9 +20549,9 @@ public CreditNotes updateCreditNote( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("CreditNotes", object.getMessage()); + handler.validationError("CreditNotes", object.getMessage(), e); } - handler.validationError("CreditNotes", object); + handler.validationError("CreditNotes", object, e); } else { handler.execute(e); } @@ -20783,9 +20783,9 @@ public Attachments updateCreditNoteAttachmentByFileName( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("Attachments", object.getMessage()); + handler.validationError("Attachments", object.getMessage(), e); } - handler.validationError("Attachments", object); + handler.validationError("Attachments", object, e); } else { handler.execute(e); } @@ -20895,9 +20895,9 @@ public ExpenseClaims updateExpenseClaim( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("ExpenseClaims", object.getMessage()); + handler.validationError("ExpenseClaims", object.getMessage(), e); } - handler.validationError("ExpenseClaims", object); + handler.validationError("ExpenseClaims", object, e); } else { handler.execute(e); } @@ -20997,9 +20997,9 @@ public Invoices updateInvoice( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("Invoices", object.getMessage()); + handler.validationError("Invoices", object.getMessage(), e); } - handler.validationError("Invoices", object); + handler.validationError("Invoices", object, e); } else { handler.execute(e); } @@ -21223,9 +21223,9 @@ public Attachments updateInvoiceAttachmentByFileName( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("Attachments", object.getMessage()); + handler.validationError("Attachments", object.getMessage(), e); } - handler.validationError("Attachments", object); + handler.validationError("Attachments", object, e); } else { handler.execute(e); } @@ -21335,9 +21335,9 @@ public Items updateItem( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("Items", object.getMessage()); + handler.validationError("Items", object.getMessage(), e); } - handler.validationError("Items", object); + handler.validationError("Items", object, e); } else { handler.execute(e); } @@ -21451,9 +21451,9 @@ public LinkedTransactions updateLinkedTransaction( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("LinkedTransactions", object.getMessage()); + handler.validationError("LinkedTransactions", object.getMessage(), e); } - handler.validationError("LinkedTransactions", object); + handler.validationError("LinkedTransactions", object, e); } else { handler.execute(e); } @@ -21558,9 +21558,9 @@ public ManualJournals updateManualJournal( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("ManualJournals", object.getMessage()); + handler.validationError("ManualJournals", object.getMessage(), e); } - handler.validationError("ManualJournals", object); + handler.validationError("ManualJournals", object, e); } else { handler.execute(e); } @@ -21777,9 +21777,9 @@ public Attachments updateManualJournalAttachmentByFileName( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("Attachments", object.getMessage()); + handler.validationError("Attachments", object.getMessage(), e); } - handler.validationError("Attachments", object); + handler.validationError("Attachments", object, e); } else { handler.execute(e); } @@ -21897,9 +21897,9 @@ public BankTransactions updateOrCreateBankTransactions( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("BankTransactions", object.getMessage()); + handler.validationError("BankTransactions", object.getMessage(), e); } - handler.validationError("BankTransactions", object); + handler.validationError("BankTransactions", object, e); } else { handler.execute(e); } @@ -22019,9 +22019,9 @@ public Contacts updateOrCreateContacts( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("Contacts", object.getMessage()); + handler.validationError("Contacts", object.getMessage(), e); } - handler.validationError("Contacts", object); + handler.validationError("Contacts", object, e); } else { handler.execute(e); } @@ -22130,9 +22130,9 @@ public CreditNotes updateOrCreateCreditNotes( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("CreditNotes", object.getMessage()); + handler.validationError("CreditNotes", object.getMessage(), e); } - handler.validationError("CreditNotes", object); + handler.validationError("CreditNotes", object, e); } else { handler.execute(e); } @@ -22249,9 +22249,9 @@ public Employees updateOrCreateEmployees( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("Employees", object.getMessage()); + handler.validationError("Employees", object.getMessage(), e); } - handler.validationError("Employees", object); + handler.validationError("Employees", object, e); } else { handler.execute(e); } @@ -22359,9 +22359,9 @@ public Invoices updateOrCreateInvoices( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("Invoices", object.getMessage()); + handler.validationError("Invoices", object.getMessage(), e); } - handler.validationError("Invoices", object); + handler.validationError("Invoices", object, e); } else { handler.execute(e); } @@ -22480,9 +22480,9 @@ public Items updateOrCreateItems( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("Items", object.getMessage()); + handler.validationError("Items", object.getMessage(), e); } - handler.validationError("Items", object); + handler.validationError("Items", object, e); } else { handler.execute(e); } @@ -22599,9 +22599,9 @@ public ManualJournals updateOrCreateManualJournals( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("ManualJournals", object.getMessage()); + handler.validationError("ManualJournals", object.getMessage(), e); } - handler.validationError("ManualJournals", object); + handler.validationError("ManualJournals", object, e); } else { handler.execute(e); } @@ -22712,9 +22712,9 @@ public PurchaseOrders updateOrCreatePurchaseOrders( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("PurchaseOrders", object.getMessage()); + handler.validationError("PurchaseOrders", object.getMessage(), e); } - handler.validationError("PurchaseOrders", object); + handler.validationError("PurchaseOrders", object, e); } else { handler.execute(e); } @@ -22820,9 +22820,9 @@ public Quotes updateOrCreateQuotes( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("Quotes", object.getMessage()); + handler.validationError("Quotes", object.getMessage(), e); } - handler.validationError("Quotes", object); + handler.validationError("Quotes", object, e); } else { handler.execute(e); } @@ -22923,9 +22923,9 @@ public PurchaseOrders updatePurchaseOrder( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("PurchaseOrders", object.getMessage()); + handler.validationError("PurchaseOrders", object.getMessage(), e); } - handler.validationError("PurchaseOrders", object); + handler.validationError("PurchaseOrders", object, e); } else { handler.execute(e); } @@ -23022,9 +23022,9 @@ public Quotes updateQuote(String accessToken, String xeroTenantId, UUID quoteID, com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("Quotes", object.getMessage()); + handler.validationError("Quotes", object.getMessage(), e); } - handler.validationError("Quotes", object); + handler.validationError("Quotes", object, e); } else { handler.execute(e); } @@ -23233,9 +23233,9 @@ public Attachments updateQuoteAttachmentByFileName( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("Attachments", object.getMessage()); + handler.validationError("Attachments", object.getMessage(), e); } - handler.validationError("Attachments", object); + handler.validationError("Attachments", object, e); } else { handler.execute(e); } @@ -23342,9 +23342,9 @@ public Receipts updateReceipt( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("Receipts", object.getMessage()); + handler.validationError("Receipts", object.getMessage(), e); } - handler.validationError("Receipts", object); + handler.validationError("Receipts", object, e); } else { handler.execute(e); } @@ -23570,9 +23570,9 @@ public Attachments updateReceiptAttachmentByFileName( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("Attachments", object.getMessage()); + handler.validationError("Attachments", object.getMessage(), e); } - handler.validationError("Attachments", object); + handler.validationError("Attachments", object, e); } else { handler.execute(e); } @@ -23800,9 +23800,9 @@ public Attachments updateRepeatingInvoiceAttachmentByFileName( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("Attachments", object.getMessage()); + handler.validationError("Attachments", object.getMessage(), e); } - handler.validationError("Attachments", object); + handler.validationError("Attachments", object, e); } else { handler.execute(e); } @@ -23909,9 +23909,9 @@ public TaxRates updateTaxRate(String accessToken, String xeroTenantId, TaxRates com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("TaxRates", object.getMessage()); + handler.validationError("TaxRates", object.getMessage(), e); } - handler.validationError("TaxRates", object); + handler.validationError("TaxRates", object, e); } else { handler.execute(e); } @@ -24004,9 +24004,9 @@ public TrackingCategories updateTrackingCategory( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("TrackingCategories", object.getMessage()); + handler.validationError("TrackingCategories", object.getMessage(), e); } - handler.validationError("TrackingCategories", object); + handler.validationError("TrackingCategories", object, e); } else { handler.execute(e); } @@ -24115,9 +24115,9 @@ public TrackingOptions updateTrackingOptions( com.xero.models.accounting.Error object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); if (object.getElements() == null || object.getElements().isEmpty()) { - handler.validationError("TrackingOptions", object.getMessage()); + handler.validationError("TrackingOptions", object.getMessage(), e); } - handler.validationError("TrackingOptions", object); + handler.validationError("TrackingOptions", object, e); } else { handler.execute(e); } diff --git a/src/main/java/com/xero/api/client/AssetApi.java b/src/main/java/com/xero/api/client/AssetApi.java index ec20f828..fc2cd4ef 100644 --- a/src/main/java/com/xero/api/client/AssetApi.java +++ b/src/main/java/com/xero/api/client/AssetApi.java @@ -35,7 +35,7 @@ public class AssetApi { private ApiClient apiClient; private static AssetApi instance = null; private String userAgent = "Default"; - private String version = "4.3.1"; + private String version = "4.3.2"; static final Logger logger = LoggerFactory.getLogger(AssetApi.class); public AssetApi() { @@ -102,7 +102,7 @@ public Asset createAsset(String accessToken, String xeroTenantId, Asset asset) new TypeReference() {}; com.xero.models.assets.Error assetError = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError("Asset", assetError); + handler.validationError("Asset", assetError, e); } else { handler.execute(e); } @@ -188,7 +188,7 @@ public AssetType createAssetType(String accessToken, String xeroTenantId, AssetT new TypeReference() {}; com.xero.models.assets.Error assetError = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError("AssetType", assetError); + handler.validationError("AssetType", assetError, e); } else { handler.execute(e); } diff --git a/src/main/java/com/xero/api/client/BankFeedsApi.java b/src/main/java/com/xero/api/client/BankFeedsApi.java index 4fc19eed..ac749b61 100644 --- a/src/main/java/com/xero/api/client/BankFeedsApi.java +++ b/src/main/java/com/xero/api/client/BankFeedsApi.java @@ -33,7 +33,7 @@ public class BankFeedsApi { private ApiClient apiClient; private static BankFeedsApi instance = null; private String userAgent = "Default"; - private String version = "4.3.1"; + private String version = "4.3.2"; static final Logger logger = LoggerFactory.getLogger(BankFeedsApi.class); public BankFeedsApi() { @@ -103,7 +103,7 @@ public FeedConnections createFeedConnections( TypeReference errorTypeRef = new TypeReference() {}; FeedConnections bankFeedError = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError("FeedConnections", bankFeedError); + handler.validationError("FeedConnections", bankFeedError, e); } else { handler.execute(e); } @@ -195,7 +195,7 @@ public Statements createStatements(String accessToken, String xeroTenantId, Stat TypeReference errorTypeRef = new TypeReference() {}; Statements bankFeedError = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError("Statements", bankFeedError); + handler.validationError("Statements", bankFeedError, e); } else { handler.execute(e); } diff --git a/src/main/java/com/xero/api/client/IdentityApi.java b/src/main/java/com/xero/api/client/IdentityApi.java index 727bb50b..e995c2de 100644 --- a/src/main/java/com/xero/api/client/IdentityApi.java +++ b/src/main/java/com/xero/api/client/IdentityApi.java @@ -31,7 +31,7 @@ public class IdentityApi { private ApiClient apiClient; private static IdentityApi instance = null; private String userAgent = "Default"; - private String version = "4.3.1"; + private String version = "4.3.2"; static final Logger logger = LoggerFactory.getLogger(IdentityApi.class); public IdentityApi() { diff --git a/src/main/java/com/xero/api/client/PayrollAuApi.java b/src/main/java/com/xero/api/client/PayrollAuApi.java index 3bec8985..2423bcda 100644 --- a/src/main/java/com/xero/api/client/PayrollAuApi.java +++ b/src/main/java/com/xero/api/client/PayrollAuApi.java @@ -50,7 +50,7 @@ public class PayrollAuApi { private ApiClient apiClient; private static PayrollAuApi instance = null; private String userAgent = "Default"; - private String version = "4.3.1"; + private String version = "4.3.2"; static final Logger logger = LoggerFactory.getLogger(PayrollAuApi.class); public PayrollAuApi() { @@ -120,9 +120,9 @@ public Employees createEmployee(String accessToken, String xeroTenantId, List() {}; com.xero.models.accounting.Error error = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError("Error", error.getMessage()); + handler.validationError("Error", error.getMessage(), e); } - handler.validationError("Employees", object); + handler.validationError("Employees", object, e); } else { handler.execute(e); } @@ -212,9 +212,9 @@ public LeaveApplications createLeaveApplication( new TypeReference() {}; com.xero.models.accounting.Error error = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError("Error", error.getMessage()); + handler.validationError("Error", error.getMessage(), e); } - handler.validationError("LeaveApplications", object); + handler.validationError("LeaveApplications", object, e); } else { handler.execute(e); } @@ -378,9 +378,9 @@ public PayRuns createPayRun(String accessToken, String xeroTenantId, List() {}; com.xero.models.accounting.Error error = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError("Error", error.getMessage()); + handler.validationError("Error", error.getMessage(), e); } - handler.validationError("PayRuns", object); + handler.validationError("PayRuns", object, e); } else { handler.execute(e); } @@ -470,9 +470,9 @@ public PayrollCalendars createPayrollCalendar( new TypeReference() {}; com.xero.models.accounting.Error error = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError("Error", error.getMessage()); + handler.validationError("Error", error.getMessage(), e); } - handler.validationError("PayrollCalendars", object); + handler.validationError("PayrollCalendars", object, e); } else { handler.execute(e); } @@ -560,9 +560,9 @@ public SuperFunds createSuperfund( new TypeReference() {}; com.xero.models.accounting.Error error = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError("Error", error.getMessage()); + handler.validationError("Error", error.getMessage(), e); } - handler.validationError("SuperFunds", object); + handler.validationError("SuperFunds", object, e); } else { handler.execute(e); } @@ -649,9 +649,9 @@ public Timesheets createTimesheet( new TypeReference() {}; com.xero.models.accounting.Error error = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError("Error", error.getMessage()); + handler.validationError("Error", error.getMessage(), e); } - handler.validationError("Timesheets", object); + handler.validationError("Timesheets", object, e); } else { handler.execute(e); } @@ -2543,7 +2543,7 @@ public Payslips updatePayslip( new TypeReference() {}; com.xero.models.accounting.Error error = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError("Error", error.getMessage()); + handler.validationError("Error", error.getMessage(), e); } else { handler.execute(e); } diff --git a/src/main/java/com/xero/api/client/PayrollNzApi.java b/src/main/java/com/xero/api/client/PayrollNzApi.java index be45c34e..b66d7c2e 100644 --- a/src/main/java/com/xero/api/client/PayrollNzApi.java +++ b/src/main/java/com/xero/api/client/PayrollNzApi.java @@ -92,7 +92,7 @@ public class PayrollNzApi { private ApiClient apiClient; private static PayrollNzApi instance = null; private String userAgent = "Default"; - private String version = "4.3.1"; + private String version = "4.3.2"; static final Logger logger = LoggerFactory.getLogger(PayrollNzApi.class); public PayrollNzApi() { @@ -159,7 +159,7 @@ public TimesheetObject approveTimesheet(String accessToken, String xeroTenantId, TypeReference errorTypeRef = new TypeReference() {}; TimesheetObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "TimesheetObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "TimesheetObject", object.getProblem(), e); } else { handler.execute(e); } @@ -245,7 +245,7 @@ public DeductionObject createDeduction( TypeReference errorTypeRef = new TypeReference() {}; DeductionObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "DeductionObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "DeductionObject", object.getProblem(), e); } else { handler.execute(e); } @@ -329,7 +329,7 @@ public EarningsRateObject createEarningsRate( TypeReference errorTypeRef = new TypeReference() {}; EarningsRateObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "EarningsRateObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "EarningsRateObject", object.getProblem(), e); } else { handler.execute(e); } @@ -411,7 +411,7 @@ public EmployeeObject createEmployee(String accessToken, String xeroTenantId, Em if (e.getStatusCode() == 400 || e.getStatusCode() == 405) { TypeReference errorTypeRef = new TypeReference() {}; EmployeeObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "EmployeeObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "EmployeeObject", object.getProblem(), e); } else { handler.execute(e); } @@ -500,7 +500,8 @@ public EarningsTemplateObject createEmployeeEarningsTemplate( new TypeReference() {}; EarningsTemplateObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "EarningsTemplateObject", object.getProblem()); + handler.validationError( + e.getStatusCode(), "EarningsTemplateObject", object.getProblem(), e); } else { handler.execute(e); } @@ -602,7 +603,7 @@ public EmployeeLeaveObject createEmployeeLeave( new TypeReference() {}; EmployeeLeaveObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "EmployeeLeaveObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "EmployeeLeaveObject", object.getProblem(), e); } else { handler.execute(e); } @@ -705,7 +706,8 @@ public EmployeeLeaveSetupObject createEmployeeLeaveSetup( new TypeReference() {}; EmployeeLeaveSetupObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "EmployeeLeaveSetupObject", object.getProblem()); + handler.validationError( + e.getStatusCode(), "EmployeeLeaveSetupObject", object.getProblem(), e); } else { handler.execute(e); } @@ -808,7 +810,8 @@ public EmployeeLeaveTypeObject createEmployeeLeaveType( new TypeReference() {}; EmployeeLeaveTypeObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "EmployeeLeaveTypeObject", object.getProblem()); + handler.validationError( + e.getStatusCode(), "EmployeeLeaveTypeObject", object.getProblem(), e); } else { handler.execute(e); } @@ -912,7 +915,7 @@ public EmployeeOpeningBalancesObject createEmployeeOpeningBalances( EmployeeOpeningBalancesObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); handler.validationError( - e.getStatusCode(), "EmployeeOpeningBalancesObject", object.getProblem()); + e.getStatusCode(), "EmployeeOpeningBalancesObject", object.getProblem(), e); } else { handler.execute(e); } @@ -1016,7 +1019,7 @@ public PaymentMethodObject createEmployeePaymentMethod( new TypeReference() {}; PaymentMethodObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "PaymentMethodObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "PaymentMethodObject", object.getProblem(), e); } else { handler.execute(e); } @@ -1115,7 +1118,7 @@ public SalaryAndWageObject createEmployeeSalaryAndWage( new TypeReference() {}; SalaryAndWageObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "SalaryAndWageObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "SalaryAndWageObject", object.getProblem(), e); } else { handler.execute(e); } @@ -1212,7 +1215,7 @@ public EmploymentObject createEmployment( TypeReference errorTypeRef = new TypeReference() {}; EmploymentObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "EmploymentObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "EmploymentObject", object.getProblem(), e); } else { handler.execute(e); } @@ -1305,7 +1308,7 @@ public LeaveTypeObject createLeaveType( TypeReference errorTypeRef = new TypeReference() {}; LeaveTypeObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "LeaveTypeObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "LeaveTypeObject", object.getProblem(), e); } else { handler.execute(e); } @@ -1398,7 +1401,7 @@ public EmployeeEarningsTemplates createMultipleEmployeeEarningsTemplate( EmployeeEarningsTemplates object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); handler.validationError( - e.getStatusCode(), "EmployeeEarningsTemplates", object.getProblem()); + e.getStatusCode(), "EmployeeEarningsTemplates", object.getProblem(), e); } else { handler.execute(e); } @@ -1497,7 +1500,7 @@ public PayRunObject createPayRun(String accessToken, String xeroTenantId, PayRun if (e.getStatusCode() == 400 || e.getStatusCode() == 405) { TypeReference errorTypeRef = new TypeReference() {}; PayRunObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "PayRunObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "PayRunObject", object.getProblem(), e); } else { handler.execute(e); } @@ -1582,7 +1585,7 @@ public PayRunCalendarObject createPayRunCalendar( new TypeReference() {}; PayRunCalendarObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "PayRunCalendarObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "PayRunCalendarObject", object.getProblem(), e); } else { handler.execute(e); } @@ -1667,7 +1670,7 @@ public ReimbursementObject createReimbursement( new TypeReference() {}; ReimbursementObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "ReimbursementObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "ReimbursementObject", object.getProblem(), e); } else { handler.execute(e); } @@ -1752,7 +1755,7 @@ public SuperannuationObject createSuperannuation( new TypeReference() {}; SuperannuationObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "SuperannuationObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "SuperannuationObject", object.getProblem(), e); } else { handler.execute(e); } @@ -1835,7 +1838,7 @@ public TimesheetObject createTimesheet( TypeReference errorTypeRef = new TypeReference() {}; TimesheetObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "TimesheetObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "TimesheetObject", object.getProblem(), e); } else { handler.execute(e); } @@ -1922,7 +1925,7 @@ public TimesheetLineObject createTimesheetLine( new TypeReference() {}; TimesheetLineObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "TimesheetLineObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "TimesheetLineObject", object.getProblem(), e); } else { handler.execute(e); } @@ -2110,7 +2113,7 @@ public EmployeeLeaveObject deleteEmployeeLeave( new TypeReference() {}; EmployeeLeaveObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "EmployeeLeaveObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "EmployeeLeaveObject", object.getProblem(), e); } else { handler.execute(e); } @@ -2458,7 +2461,7 @@ public DeductionObject getDeduction(String accessToken, String xeroTenantId, UUI TypeReference errorTypeRef = new TypeReference() {}; DeductionObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "DeductionObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "DeductionObject", object.getProblem(), e); } else { handler.execute(e); } @@ -2542,7 +2545,7 @@ public Deductions getDeductions(String accessToken, String xeroTenantId, Integer if (e.getStatusCode() == 400 || e.getStatusCode() == 405) { TypeReference errorTypeRef = new TypeReference() {}; Deductions object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "Deductions", object.getProblem()); + handler.validationError(e.getStatusCode(), "Deductions", object.getProblem(), e); } else { handler.execute(e); } @@ -2629,7 +2632,7 @@ public EarningsRateObject getEarningsRate( TypeReference errorTypeRef = new TypeReference() {}; EarningsRateObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "EarningsRateObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "EarningsRateObject", object.getProblem(), e); } else { handler.execute(e); } @@ -2713,7 +2716,7 @@ public EarningsRates getEarningsRates(String accessToken, String xeroTenantId, I if (e.getStatusCode() == 400 || e.getStatusCode() == 405) { TypeReference errorTypeRef = new TypeReference() {}; EarningsRates object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "EarningsRates", object.getProblem()); + handler.validationError(e.getStatusCode(), "EarningsRates", object.getProblem(), e); } else { handler.execute(e); } @@ -2798,7 +2801,7 @@ public EmployeeObject getEmployee(String accessToken, String xeroTenantId, UUID if (e.getStatusCode() == 400 || e.getStatusCode() == 405) { TypeReference errorTypeRef = new TypeReference() {}; EmployeeObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "EmployeeObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "EmployeeObject", object.getProblem(), e); } else { handler.execute(e); } @@ -2883,7 +2886,7 @@ public EmployeeLeaveBalances getEmployeeLeaveBalances( new TypeReference() {}; EmployeeLeaveBalances object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "EmployeeLeaveBalances", object.getProblem()); + handler.validationError(e.getStatusCode(), "EmployeeLeaveBalances", object.getProblem(), e); } else { handler.execute(e); } @@ -2977,7 +2980,7 @@ public LeavePeriods getEmployeeLeavePeriods( if (e.getStatusCode() == 400 || e.getStatusCode() == 405) { TypeReference errorTypeRef = new TypeReference() {}; LeavePeriods object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "LeavePeriods", object.getProblem()); + handler.validationError(e.getStatusCode(), "LeavePeriods", object.getProblem(), e); } else { handler.execute(e); } @@ -3091,7 +3094,7 @@ public EmployeeLeaveTypes getEmployeeLeaveTypes( TypeReference errorTypeRef = new TypeReference() {}; EmployeeLeaveTypes object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "EmployeeLeaveTypes", object.getProblem()); + handler.validationError(e.getStatusCode(), "EmployeeLeaveTypes", object.getProblem(), e); } else { handler.execute(e); } @@ -3175,7 +3178,7 @@ public EmployeeLeaves getEmployeeLeaves(String accessToken, String xeroTenantId, if (e.getStatusCode() == 400 || e.getStatusCode() == 405) { TypeReference errorTypeRef = new TypeReference() {}; EmployeeLeaves object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "EmployeeLeaves", object.getProblem()); + handler.validationError(e.getStatusCode(), "EmployeeLeaves", object.getProblem(), e); } else { handler.execute(e); } @@ -3263,7 +3266,7 @@ public EmployeeOpeningBalancesObject getEmployeeOpeningBalances( EmployeeOpeningBalancesObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); handler.validationError( - e.getStatusCode(), "EmployeeOpeningBalancesObject", object.getProblem()); + e.getStatusCode(), "EmployeeOpeningBalancesObject", object.getProblem(), e); } else { handler.execute(e); } @@ -3351,7 +3354,7 @@ public EmployeePayTemplates getEmployeePayTemplates( new TypeReference() {}; EmployeePayTemplates object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "EmployeePayTemplates", object.getProblem()); + handler.validationError(e.getStatusCode(), "EmployeePayTemplates", object.getProblem(), e); } else { handler.execute(e); } @@ -3439,7 +3442,7 @@ public PaymentMethodObject getEmployeePaymentMethod( new TypeReference() {}; PaymentMethodObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "PaymentMethodObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "PaymentMethodObject", object.getProblem(), e); } else { handler.execute(e); } @@ -3526,7 +3529,7 @@ public SalaryAndWages getEmployeeSalaryAndWage( if (e.getStatusCode() == 400 || e.getStatusCode() == 405) { TypeReference errorTypeRef = new TypeReference() {}; SalaryAndWages object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "SalaryAndWages", object.getProblem()); + handler.validationError(e.getStatusCode(), "SalaryAndWages", object.getProblem(), e); } else { handler.execute(e); } @@ -3622,7 +3625,7 @@ public SalaryAndWages getEmployeeSalaryAndWages( if (e.getStatusCode() == 400 || e.getStatusCode() == 405) { TypeReference errorTypeRef = new TypeReference() {}; SalaryAndWages object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "SalaryAndWages", object.getProblem()); + handler.validationError(e.getStatusCode(), "SalaryAndWages", object.getProblem(), e); } else { handler.execute(e); } @@ -3717,7 +3720,7 @@ public EmployeeTaxObject getEmployeeTax(String accessToken, String xeroTenantId, TypeReference errorTypeRef = new TypeReference() {}; EmployeeTaxObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "EmployeeTaxObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "EmployeeTaxObject", object.getProblem(), e); } else { handler.execute(e); } @@ -3807,7 +3810,7 @@ public Employees getEmployees( if (e.getStatusCode() == 400 || e.getStatusCode() == 405) { TypeReference errorTypeRef = new TypeReference() {}; Employees object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "Employees", object.getProblem()); + handler.validationError(e.getStatusCode(), "Employees", object.getProblem(), e); } else { handler.execute(e); } @@ -3916,7 +3919,7 @@ public LeaveTypeObject getLeaveType(String accessToken, String xeroTenantId, UUI TypeReference errorTypeRef = new TypeReference() {}; LeaveTypeObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "LeaveTypeObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "LeaveTypeObject", object.getProblem(), e); } else { handler.execute(e); } @@ -4004,7 +4007,7 @@ public LeaveTypes getLeaveTypes( if (e.getStatusCode() == 400 || e.getStatusCode() == 405) { TypeReference errorTypeRef = new TypeReference() {}; LeaveTypes object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "LeaveTypes", object.getProblem()); + handler.validationError(e.getStatusCode(), "LeaveTypes", object.getProblem(), e); } else { handler.execute(e); } @@ -4101,7 +4104,7 @@ public PayRunObject getPayRun(String accessToken, String xeroTenantId, UUID payR if (e.getStatusCode() == 400 || e.getStatusCode() == 405) { TypeReference errorTypeRef = new TypeReference() {}; PayRunObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "PayRunObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "PayRunObject", object.getProblem(), e); } else { handler.execute(e); } @@ -4186,7 +4189,7 @@ public PayRunCalendarObject getPayRunCalendar( new TypeReference() {}; PayRunCalendarObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "PayRunCalendarObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "PayRunCalendarObject", object.getProblem(), e); } else { handler.execute(e); } @@ -4271,7 +4274,7 @@ public PayRunCalendars getPayRunCalendars(String accessToken, String xeroTenantI TypeReference errorTypeRef = new TypeReference() {}; PayRunCalendars object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "PayRunCalendars", object.getProblem()); + handler.validationError(e.getStatusCode(), "PayRunCalendars", object.getProblem(), e); } else { handler.execute(e); } @@ -4360,7 +4363,7 @@ public PayRuns getPayRuns(String accessToken, String xeroTenantId, Integer page, if (e.getStatusCode() == 400 || e.getStatusCode() == 405) { TypeReference errorTypeRef = new TypeReference() {}; PayRuns object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "PayRuns", object.getProblem()); + handler.validationError(e.getStatusCode(), "PayRuns", object.getProblem(), e); } else { handler.execute(e); } @@ -4456,7 +4459,7 @@ public PaySlipObject getPaySlip(String accessToken, String xeroTenantId, UUID pa if (e.getStatusCode() == 400 || e.getStatusCode() == 405) { TypeReference errorTypeRef = new TypeReference() {}; PaySlipObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "PaySlipObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "PaySlipObject", object.getProblem(), e); } else { handler.execute(e); } @@ -4541,7 +4544,7 @@ public PaySlips getPaySlips(String accessToken, String xeroTenantId, UUID payRun if (e.getStatusCode() == 400 || e.getStatusCode() == 405) { TypeReference errorTypeRef = new TypeReference() {}; PaySlips object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "PaySlips", object.getProblem()); + handler.validationError(e.getStatusCode(), "PaySlips", object.getProblem(), e); } else { handler.execute(e); } @@ -4644,7 +4647,7 @@ public ReimbursementObject getReimbursement( new TypeReference() {}; ReimbursementObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "ReimbursementObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "ReimbursementObject", object.getProblem(), e); } else { handler.execute(e); } @@ -4728,7 +4731,7 @@ public Reimbursements getReimbursements(String accessToken, String xeroTenantId, if (e.getStatusCode() == 400 || e.getStatusCode() == 405) { TypeReference errorTypeRef = new TypeReference() {}; Reimbursements object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "Reimbursements", object.getProblem()); + handler.validationError(e.getStatusCode(), "Reimbursements", object.getProblem(), e); } else { handler.execute(e); } @@ -4811,7 +4814,7 @@ public Settings getSettings(String accessToken, String xeroTenantId) throws IOEx if (e.getStatusCode() == 400 || e.getStatusCode() == 405) { TypeReference errorTypeRef = new TypeReference() {}; Settings object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "Settings", object.getProblem()); + handler.validationError(e.getStatusCode(), "Settings", object.getProblem(), e); } else { handler.execute(e); } @@ -5203,7 +5206,7 @@ public TimesheetObject getTimesheet(String accessToken, String xeroTenantId, UUI TypeReference errorTypeRef = new TypeReference() {}; TimesheetObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "TimesheetObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "TimesheetObject", object.getProblem(), e); } else { handler.execute(e); } @@ -5302,7 +5305,7 @@ public Timesheets getTimesheets( if (e.getStatusCode() == 400 || e.getStatusCode() == 405) { TypeReference errorTypeRef = new TypeReference() {}; Timesheets object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "Timesheets", object.getProblem()); + handler.validationError(e.getStatusCode(), "Timesheets", object.getProblem(), e); } else { handler.execute(e); } @@ -5414,7 +5417,7 @@ public TrackingCategories getTrackingCategories(String accessToken, String xeroT TypeReference errorTypeRef = new TypeReference() {}; TrackingCategories object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "TrackingCategories", object.getProblem()); + handler.validationError(e.getStatusCode(), "TrackingCategories", object.getProblem(), e); } else { handler.execute(e); } @@ -5493,7 +5496,7 @@ public TimesheetObject revertTimesheet(String accessToken, String xeroTenantId, TypeReference errorTypeRef = new TypeReference() {}; TimesheetObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "TimesheetObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "TimesheetObject", object.getProblem(), e); } else { handler.execute(e); } @@ -5581,7 +5584,7 @@ public EmployeeObject updateEmployee( if (e.getStatusCode() == 400 || e.getStatusCode() == 405) { TypeReference errorTypeRef = new TypeReference() {}; EmployeeObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "EmployeeObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "EmployeeObject", object.getProblem(), e); } else { handler.execute(e); } @@ -5684,7 +5687,8 @@ public EarningsTemplateObject updateEmployeeEarningsTemplate( new TypeReference() {}; EarningsTemplateObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "EarningsTemplateObject", object.getProblem()); + handler.validationError( + e.getStatusCode(), "EarningsTemplateObject", object.getProblem(), e); } else { handler.execute(e); } @@ -5803,7 +5807,7 @@ public EmployeeLeaveObject updateEmployeeLeave( new TypeReference() {}; EmployeeLeaveObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "EmployeeLeaveObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "EmployeeLeaveObject", object.getProblem(), e); } else { handler.execute(e); } @@ -5915,7 +5919,7 @@ public SalaryAndWageObject updateEmployeeSalaryAndWage( new TypeReference() {}; SalaryAndWageObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "SalaryAndWageObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "SalaryAndWageObject", object.getProblem(), e); } else { handler.execute(e); } @@ -6021,7 +6025,7 @@ public EmployeeTaxObject updateEmployeeTax( TypeReference errorTypeRef = new TypeReference() {}; EmployeeTaxObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "EmployeeTaxObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "EmployeeTaxObject", object.getProblem(), e); } else { handler.execute(e); } @@ -6115,7 +6119,7 @@ public PayRunObject updatePayRun( if (e.getStatusCode() == 400 || e.getStatusCode() == 405) { TypeReference errorTypeRef = new TypeReference() {}; PayRunObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "PayRunObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "PayRunObject", object.getProblem(), e); } else { handler.execute(e); } @@ -6207,7 +6211,7 @@ public PaySlipObject updatePaySlipLineItems( if (e.getStatusCode() == 400 || e.getStatusCode() == 405) { TypeReference errorTypeRef = new TypeReference() {}; PaySlipObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "PaySlipObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "PaySlipObject", object.getProblem(), e); } else { handler.execute(e); } @@ -6308,7 +6312,7 @@ public TimesheetLineObject updateTimesheetLine( new TypeReference() {}; TimesheetLineObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "TimesheetLineObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "TimesheetLineObject", object.getProblem(), e); } else { handler.execute(e); } diff --git a/src/main/java/com/xero/api/client/PayrollUkApi.java b/src/main/java/com/xero/api/client/PayrollUkApi.java index dbecb89c..c6163a14 100644 --- a/src/main/java/com/xero/api/client/PayrollUkApi.java +++ b/src/main/java/com/xero/api/client/PayrollUkApi.java @@ -92,7 +92,7 @@ public class PayrollUkApi { private ApiClient apiClient; private static PayrollUkApi instance = null; private String userAgent = "Default"; - private String version = "4.3.1"; + private String version = "4.3.2"; static final Logger logger = LoggerFactory.getLogger(PayrollUkApi.class); public PayrollUkApi() { @@ -159,7 +159,7 @@ public TimesheetObject approveTimesheet(String accessToken, String xeroTenantId, TypeReference errorTypeRef = new TypeReference() {}; TimesheetObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "TimesheetObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "TimesheetObject", object.getProblem(), e); } else { handler.execute(e); } @@ -244,7 +244,7 @@ public BenefitObject createBenefit(String accessToken, String xeroTenantId, Bene if (e.getStatusCode() == 400 || e.getStatusCode() == 405) { TypeReference errorTypeRef = new TypeReference() {}; BenefitObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "BenefitObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "BenefitObject", object.getProblem(), e); } else { handler.execute(e); } @@ -327,7 +327,7 @@ public DeductionObject createDeduction( TypeReference errorTypeRef = new TypeReference() {}; DeductionObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "DeductionObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "DeductionObject", object.getProblem(), e); } else { handler.execute(e); } @@ -411,7 +411,7 @@ public EarningsRateObject createEarningsRate( TypeReference errorTypeRef = new TypeReference() {}; EarningsRateObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "EarningsRateObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "EarningsRateObject", object.getProblem(), e); } else { handler.execute(e); } @@ -493,7 +493,7 @@ public EmployeeObject createEmployee(String accessToken, String xeroTenantId, Em if (e.getStatusCode() == 400 || e.getStatusCode() == 405) { TypeReference errorTypeRef = new TypeReference() {}; EmployeeObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "EmployeeObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "EmployeeObject", object.getProblem(), e); } else { handler.execute(e); } @@ -582,7 +582,8 @@ public EarningsTemplateObject createEmployeeEarningsTemplate( new TypeReference() {}; EarningsTemplateObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "EarningsTemplateObject", object.getProblem()); + handler.validationError( + e.getStatusCode(), "EarningsTemplateObject", object.getProblem(), e); } else { handler.execute(e); } @@ -684,7 +685,7 @@ public EmployeeLeaveObject createEmployeeLeave( new TypeReference() {}; EmployeeLeaveObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "EmployeeLeaveObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "EmployeeLeaveObject", object.getProblem(), e); } else { handler.execute(e); } @@ -783,7 +784,8 @@ public EmployeeLeaveTypeObject createEmployeeLeaveType( new TypeReference() {}; EmployeeLeaveTypeObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "EmployeeLeaveTypeObject", object.getProblem()); + handler.validationError( + e.getStatusCode(), "EmployeeLeaveTypeObject", object.getProblem(), e); } else { handler.execute(e); } @@ -887,7 +889,7 @@ public EmployeeOpeningBalancesObject createEmployeeOpeningBalances( EmployeeOpeningBalancesObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); handler.validationError( - e.getStatusCode(), "EmployeeOpeningBalancesObject", object.getProblem()); + e.getStatusCode(), "EmployeeOpeningBalancesObject", object.getProblem(), e); } else { handler.execute(e); } @@ -991,7 +993,7 @@ public PaymentMethodObject createEmployeePaymentMethod( new TypeReference() {}; PaymentMethodObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "PaymentMethodObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "PaymentMethodObject", object.getProblem(), e); } else { handler.execute(e); } @@ -1090,7 +1092,7 @@ public SalaryAndWageObject createEmployeeSalaryAndWage( new TypeReference() {}; SalaryAndWageObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "SalaryAndWageObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "SalaryAndWageObject", object.getProblem(), e); } else { handler.execute(e); } @@ -1192,7 +1194,7 @@ public EmployeeStatutorySickLeaveObject createEmployeeStatutorySickLeave( EmployeeStatutorySickLeaveObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); handler.validationError( - e.getStatusCode(), "EmployeeStatutorySickLeaveObject", object.getProblem()); + e.getStatusCode(), "EmployeeStatutorySickLeaveObject", object.getProblem(), e); } else { handler.execute(e); } @@ -1284,7 +1286,7 @@ public EmploymentObject createEmployment( TypeReference errorTypeRef = new TypeReference() {}; EmploymentObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "EmploymentObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "EmploymentObject", object.getProblem(), e); } else { handler.execute(e); } @@ -1377,7 +1379,7 @@ public LeaveTypeObject createLeaveType( TypeReference errorTypeRef = new TypeReference() {}; LeaveTypeObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "LeaveTypeObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "LeaveTypeObject", object.getProblem(), e); } else { handler.execute(e); } @@ -1468,7 +1470,7 @@ public EmployeePayTemplates createMultipleEmployeeEarningsTemplate( new TypeReference() {}; EmployeePayTemplates object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "EmployeePayTemplates", object.getProblem()); + handler.validationError(e.getStatusCode(), "EmployeePayTemplates", object.getProblem(), e); } else { handler.execute(e); } @@ -1570,7 +1572,7 @@ public PayRunCalendarObject createPayRunCalendar( new TypeReference() {}; PayRunCalendarObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "PayRunCalendarObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "PayRunCalendarObject", object.getProblem(), e); } else { handler.execute(e); } @@ -1655,7 +1657,7 @@ public ReimbursementObject createReimbursement( new TypeReference() {}; ReimbursementObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "ReimbursementObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "ReimbursementObject", object.getProblem(), e); } else { handler.execute(e); } @@ -1738,7 +1740,7 @@ public TimesheetObject createTimesheet( TypeReference errorTypeRef = new TypeReference() {}; TimesheetObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "TimesheetObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "TimesheetObject", object.getProblem(), e); } else { handler.execute(e); } @@ -1825,7 +1827,7 @@ public TimesheetLineObject createTimesheetLine( new TypeReference() {}; TimesheetLineObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "TimesheetLineObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "TimesheetLineObject", object.getProblem(), e); } else { handler.execute(e); } @@ -2007,7 +2009,7 @@ public EmployeeLeaveObject deleteEmployeeLeave( new TypeReference() {}; EmployeeLeaveObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "EmployeeLeaveObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "EmployeeLeaveObject", object.getProblem(), e); } else { handler.execute(e); } @@ -2349,7 +2351,7 @@ public BenefitObject getBenefit(String accessToken, String xeroTenantId, UUID id if (e.getStatusCode() == 400 || e.getStatusCode() == 405) { TypeReference errorTypeRef = new TypeReference() {}; BenefitObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "BenefitObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "BenefitObject", object.getProblem(), e); } else { handler.execute(e); } @@ -2432,7 +2434,7 @@ public Benefits getBenefits(String accessToken, String xeroTenantId, Integer pag if (e.getStatusCode() == 400 || e.getStatusCode() == 405) { TypeReference errorTypeRef = new TypeReference() {}; Benefits object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "Benefits", object.getProblem()); + handler.validationError(e.getStatusCode(), "Benefits", object.getProblem(), e); } else { handler.execute(e); } @@ -2518,7 +2520,7 @@ public DeductionObject getDeduction(String accessToken, String xeroTenantId, UUI TypeReference errorTypeRef = new TypeReference() {}; DeductionObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "DeductionObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "DeductionObject", object.getProblem(), e); } else { handler.execute(e); } @@ -2602,7 +2604,7 @@ public Deductions getDeductions(String accessToken, String xeroTenantId, Integer if (e.getStatusCode() == 400 || e.getStatusCode() == 405) { TypeReference errorTypeRef = new TypeReference() {}; Deductions object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "Deductions", object.getProblem()); + handler.validationError(e.getStatusCode(), "Deductions", object.getProblem(), e); } else { handler.execute(e); } @@ -2689,7 +2691,7 @@ public EarningsOrderObject getEarningsOrder(String accessToken, String xeroTenan new TypeReference() {}; EarningsOrderObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "EarningsOrderObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "EarningsOrderObject", object.getProblem(), e); } else { handler.execute(e); } @@ -2772,7 +2774,7 @@ public EarningsOrders getEarningsOrders(String accessToken, String xeroTenantId, if (e.getStatusCode() == 400 || e.getStatusCode() == 405) { TypeReference errorTypeRef = new TypeReference() {}; EarningsOrders object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "EarningsOrders", object.getProblem()); + handler.validationError(e.getStatusCode(), "EarningsOrders", object.getProblem(), e); } else { handler.execute(e); } @@ -2859,7 +2861,7 @@ public EarningsRateObject getEarningsRate( TypeReference errorTypeRef = new TypeReference() {}; EarningsRateObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "EarningsRateObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "EarningsRateObject", object.getProblem(), e); } else { handler.execute(e); } @@ -2943,7 +2945,7 @@ public EarningsRates getEarningsRates(String accessToken, String xeroTenantId, I if (e.getStatusCode() == 400 || e.getStatusCode() == 405) { TypeReference errorTypeRef = new TypeReference() {}; EarningsRates object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "EarningsRates", object.getProblem()); + handler.validationError(e.getStatusCode(), "EarningsRates", object.getProblem(), e); } else { handler.execute(e); } @@ -3028,7 +3030,7 @@ public EmployeeObject getEmployee(String accessToken, String xeroTenantId, UUID if (e.getStatusCode() == 400 || e.getStatusCode() == 405) { TypeReference errorTypeRef = new TypeReference() {}; EmployeeObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "EmployeeObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "EmployeeObject", object.getProblem(), e); } else { handler.execute(e); } @@ -3114,7 +3116,7 @@ public EmployeeLeaveObject getEmployeeLeave( new TypeReference() {}; EmployeeLeaveObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "EmployeeLeaveObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "EmployeeLeaveObject", object.getProblem(), e); } else { handler.execute(e); } @@ -3205,7 +3207,7 @@ public EmployeeLeaveBalances getEmployeeLeaveBalances( new TypeReference() {}; EmployeeLeaveBalances object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "EmployeeLeaveBalances", object.getProblem()); + handler.validationError(e.getStatusCode(), "EmployeeLeaveBalances", object.getProblem(), e); } else { handler.execute(e); } @@ -3299,7 +3301,7 @@ public LeavePeriods getEmployeeLeavePeriods( if (e.getStatusCode() == 400 || e.getStatusCode() == 405) { TypeReference errorTypeRef = new TypeReference() {}; LeavePeriods object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "LeavePeriods", object.getProblem()); + handler.validationError(e.getStatusCode(), "LeavePeriods", object.getProblem(), e); } else { handler.execute(e); } @@ -3413,7 +3415,7 @@ public EmployeeLeaveTypes getEmployeeLeaveTypes( TypeReference errorTypeRef = new TypeReference() {}; EmployeeLeaveTypes object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "EmployeeLeaveTypes", object.getProblem()); + handler.validationError(e.getStatusCode(), "EmployeeLeaveTypes", object.getProblem(), e); } else { handler.execute(e); } @@ -3497,7 +3499,7 @@ public EmployeeLeaves getEmployeeLeaves(String accessToken, String xeroTenantId, if (e.getStatusCode() == 400 || e.getStatusCode() == 405) { TypeReference errorTypeRef = new TypeReference() {}; EmployeeLeaves object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "EmployeeLeaves", object.getProblem()); + handler.validationError(e.getStatusCode(), "EmployeeLeaves", object.getProblem(), e); } else { handler.execute(e); } @@ -3585,7 +3587,7 @@ public EmployeeOpeningBalancesObject getEmployeeOpeningBalances( EmployeeOpeningBalancesObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); handler.validationError( - e.getStatusCode(), "EmployeeOpeningBalancesObject", object.getProblem()); + e.getStatusCode(), "EmployeeOpeningBalancesObject", object.getProblem(), e); } else { handler.execute(e); } @@ -3675,7 +3677,7 @@ public EmployeePayTemplateObject getEmployeePayTemplate( EmployeePayTemplateObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); handler.validationError( - e.getStatusCode(), "EmployeePayTemplateObject", object.getProblem()); + e.getStatusCode(), "EmployeePayTemplateObject", object.getProblem(), e); } else { handler.execute(e); } @@ -3763,7 +3765,7 @@ public PaymentMethodObject getEmployeePaymentMethod( new TypeReference() {}; PaymentMethodObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "PaymentMethodObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "PaymentMethodObject", object.getProblem(), e); } else { handler.execute(e); } @@ -3850,7 +3852,7 @@ public SalaryAndWages getEmployeeSalaryAndWage( if (e.getStatusCode() == 400 || e.getStatusCode() == 405) { TypeReference errorTypeRef = new TypeReference() {}; SalaryAndWages object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "SalaryAndWages", object.getProblem()); + handler.validationError(e.getStatusCode(), "SalaryAndWages", object.getProblem(), e); } else { handler.execute(e); } @@ -3946,7 +3948,7 @@ public SalaryAndWages getEmployeeSalaryAndWages( if (e.getStatusCode() == 400 || e.getStatusCode() == 405) { TypeReference errorTypeRef = new TypeReference() {}; SalaryAndWages object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "SalaryAndWages", object.getProblem()); + handler.validationError(e.getStatusCode(), "SalaryAndWages", object.getProblem(), e); } else { handler.execute(e); } @@ -4054,7 +4056,7 @@ public EmployeeStatutoryLeaveBalanceObject getEmployeeStatutoryLeaveBalances( EmployeeStatutoryLeaveBalanceObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); handler.validationError( - e.getStatusCode(), "EmployeeStatutoryLeaveBalanceObject", object.getProblem()); + e.getStatusCode(), "EmployeeStatutoryLeaveBalanceObject", object.getProblem(), e); } else { handler.execute(e); } @@ -4174,7 +4176,7 @@ public EmployeeStatutorySickLeaveObject getEmployeeStatutorySickLeave( EmployeeStatutorySickLeaveObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); handler.validationError( - e.getStatusCode(), "EmployeeStatutorySickLeaveObject", object.getProblem()); + e.getStatusCode(), "EmployeeStatutorySickLeaveObject", object.getProblem(), e); } else { handler.execute(e); } @@ -4262,7 +4264,7 @@ public EmployeeTaxObject getEmployeeTax(String accessToken, String xeroTenantId, TypeReference errorTypeRef = new TypeReference() {}; EmployeeTaxObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "EmployeeTaxObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "EmployeeTaxObject", object.getProblem(), e); } else { handler.execute(e); } @@ -4352,7 +4354,7 @@ public Employees getEmployees( if (e.getStatusCode() == 400 || e.getStatusCode() == 405) { TypeReference errorTypeRef = new TypeReference() {}; Employees object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "Employees", object.getProblem()); + handler.validationError(e.getStatusCode(), "Employees", object.getProblem(), e); } else { handler.execute(e); } @@ -4461,7 +4463,7 @@ public LeaveTypeObject getLeaveType(String accessToken, String xeroTenantId, UUI TypeReference errorTypeRef = new TypeReference() {}; LeaveTypeObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "LeaveTypeObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "LeaveTypeObject", object.getProblem(), e); } else { handler.execute(e); } @@ -4549,7 +4551,7 @@ public LeaveTypes getLeaveTypes( if (e.getStatusCode() == 400 || e.getStatusCode() == 405) { TypeReference errorTypeRef = new TypeReference() {}; LeaveTypes object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "LeaveTypes", object.getProblem()); + handler.validationError(e.getStatusCode(), "LeaveTypes", object.getProblem(), e); } else { handler.execute(e); } @@ -4646,7 +4648,7 @@ public PayRunObject getPayRun(String accessToken, String xeroTenantId, UUID payR if (e.getStatusCode() == 400 || e.getStatusCode() == 405) { TypeReference errorTypeRef = new TypeReference() {}; PayRunObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "PayRunObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "PayRunObject", object.getProblem(), e); } else { handler.execute(e); } @@ -4731,7 +4733,7 @@ public PayRunCalendarObject getPayRunCalendar( new TypeReference() {}; PayRunCalendarObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "PayRunCalendarObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "PayRunCalendarObject", object.getProblem(), e); } else { handler.execute(e); } @@ -4816,7 +4818,7 @@ public PayRunCalendars getPayRunCalendars(String accessToken, String xeroTenantI TypeReference errorTypeRef = new TypeReference() {}; PayRunCalendars object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "PayRunCalendars", object.getProblem()); + handler.validationError(e.getStatusCode(), "PayRunCalendars", object.getProblem(), e); } else { handler.execute(e); } @@ -4905,7 +4907,7 @@ public PayRuns getPayRuns(String accessToken, String xeroTenantId, Integer page, if (e.getStatusCode() == 400 || e.getStatusCode() == 405) { TypeReference errorTypeRef = new TypeReference() {}; PayRuns object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "PayRuns", object.getProblem()); + handler.validationError(e.getStatusCode(), "PayRuns", object.getProblem(), e); } else { handler.execute(e); } @@ -5001,7 +5003,7 @@ public PayslipObject getPaySlip(String accessToken, String xeroTenantId, UUID pa if (e.getStatusCode() == 400 || e.getStatusCode() == 405) { TypeReference errorTypeRef = new TypeReference() {}; PayslipObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "PayslipObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "PayslipObject", object.getProblem(), e); } else { handler.execute(e); } @@ -5086,7 +5088,7 @@ public Payslips getPaySlips(String accessToken, String xeroTenantId, UUID payRun if (e.getStatusCode() == 400 || e.getStatusCode() == 405) { TypeReference errorTypeRef = new TypeReference() {}; Payslips object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "Payslips", object.getProblem()); + handler.validationError(e.getStatusCode(), "Payslips", object.getProblem(), e); } else { handler.execute(e); } @@ -5189,7 +5191,7 @@ public ReimbursementObject getReimbursement( new TypeReference() {}; ReimbursementObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "ReimbursementObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "ReimbursementObject", object.getProblem(), e); } else { handler.execute(e); } @@ -5273,7 +5275,7 @@ public Reimbursements getReimbursements(String accessToken, String xeroTenantId, if (e.getStatusCode() == 400 || e.getStatusCode() == 405) { TypeReference errorTypeRef = new TypeReference() {}; Reimbursements object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "Reimbursements", object.getProblem()); + handler.validationError(e.getStatusCode(), "Reimbursements", object.getProblem(), e); } else { handler.execute(e); } @@ -5356,7 +5358,7 @@ public Settings getSettings(String accessToken, String xeroTenantId) throws IOEx if (e.getStatusCode() == 400 || e.getStatusCode() == 405) { TypeReference errorTypeRef = new TypeReference() {}; Settings object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "Settings", object.getProblem()); + handler.validationError(e.getStatusCode(), "Settings", object.getProblem(), e); } else { handler.execute(e); } @@ -5439,7 +5441,7 @@ public EmployeeStatutoryLeavesSummaries getStatutoryLeaveSummary( EmployeeStatutoryLeavesSummaries object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); handler.validationError( - e.getStatusCode(), "EmployeeStatutoryLeavesSummaries", object.getProblem()); + e.getStatusCode(), "EmployeeStatutoryLeavesSummaries", object.getProblem(), e); } else { handler.execute(e); } @@ -5535,7 +5537,7 @@ public TimesheetObject getTimesheet(String accessToken, String xeroTenantId, UUI TypeReference errorTypeRef = new TypeReference() {}; TimesheetObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "TimesheetObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "TimesheetObject", object.getProblem(), e); } else { handler.execute(e); } @@ -5634,7 +5636,7 @@ public Timesheets getTimesheets( if (e.getStatusCode() == 400 || e.getStatusCode() == 405) { TypeReference errorTypeRef = new TypeReference() {}; Timesheets object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "Timesheets", object.getProblem()); + handler.validationError(e.getStatusCode(), "Timesheets", object.getProblem(), e); } else { handler.execute(e); } @@ -5746,7 +5748,7 @@ public TrackingCategories getTrackingCategories(String accessToken, String xeroT TypeReference errorTypeRef = new TypeReference() {}; TrackingCategories object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "TrackingCategories", object.getProblem()); + handler.validationError(e.getStatusCode(), "TrackingCategories", object.getProblem(), e); } else { handler.execute(e); } @@ -5825,7 +5827,7 @@ public TimesheetObject revertTimesheet(String accessToken, String xeroTenantId, TypeReference errorTypeRef = new TypeReference() {}; TimesheetObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "TimesheetObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "TimesheetObject", object.getProblem(), e); } else { handler.execute(e); } @@ -5913,7 +5915,7 @@ public EmployeeObject updateEmployee( if (e.getStatusCode() == 400 || e.getStatusCode() == 405) { TypeReference errorTypeRef = new TypeReference() {}; EmployeeObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "EmployeeObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "EmployeeObject", object.getProblem(), e); } else { handler.execute(e); } @@ -6016,7 +6018,8 @@ public EarningsTemplateObject updateEmployeeEarningsTemplate( new TypeReference() {}; EarningsTemplateObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "EarningsTemplateObject", object.getProblem()); + handler.validationError( + e.getStatusCode(), "EarningsTemplateObject", object.getProblem(), e); } else { handler.execute(e); } @@ -6135,7 +6138,7 @@ public EmployeeLeaveObject updateEmployeeLeave( new TypeReference() {}; EmployeeLeaveObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "EmployeeLeaveObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "EmployeeLeaveObject", object.getProblem(), e); } else { handler.execute(e); } @@ -6247,7 +6250,7 @@ public EmployeeOpeningBalancesObject updateEmployeeOpeningBalances( EmployeeOpeningBalancesObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); handler.validationError( - e.getStatusCode(), "EmployeeOpeningBalancesObject", object.getProblem()); + e.getStatusCode(), "EmployeeOpeningBalancesObject", object.getProblem(), e); } else { handler.execute(e); } @@ -6356,7 +6359,7 @@ public SalaryAndWageObject updateEmployeeSalaryAndWage( new TypeReference() {}; SalaryAndWageObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "SalaryAndWageObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "SalaryAndWageObject", object.getProblem(), e); } else { handler.execute(e); } @@ -6462,7 +6465,7 @@ public PayRunObject updatePayRun( if (e.getStatusCode() == 400 || e.getStatusCode() == 405) { TypeReference errorTypeRef = new TypeReference() {}; PayRunObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "PayRunObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "PayRunObject", object.getProblem(), e); } else { handler.execute(e); } @@ -6563,7 +6566,7 @@ public TimesheetLineObject updateTimesheetLine( new TypeReference() {}; TimesheetLineObject object = apiClient.getObjectMapper().readValue(e.getContent(), errorTypeRef); - handler.validationError(e.getStatusCode(), "TimesheetLineObject", object.getProblem()); + handler.validationError(e.getStatusCode(), "TimesheetLineObject", object.getProblem(), e); } else { handler.execute(e); } diff --git a/src/main/java/com/xero/api/client/ProjectApi.java b/src/main/java/com/xero/api/client/ProjectApi.java index fd33ab6b..ccac7810 100644 --- a/src/main/java/com/xero/api/client/ProjectApi.java +++ b/src/main/java/com/xero/api/client/ProjectApi.java @@ -41,7 +41,7 @@ public class ProjectApi { private ApiClient apiClient; private static ProjectApi instance = null; private String userAgent = "Default"; - private String version = "4.3.1"; + private String version = "4.3.2"; static final Logger logger = LoggerFactory.getLogger(ProjectApi.class); public ProjectApi() { diff --git a/src/test/java/com/xero/api/XeroExceptionsTest.java b/src/test/java/com/xero/api/XeroExceptionsTest.java index e2c3a2b9..2c83f6e4 100644 --- a/src/test/java/com/xero/api/XeroExceptionsTest.java +++ b/src/test/java/com/xero/api/XeroExceptionsTest.java @@ -37,20 +37,22 @@ public void setUp() { @Test public void testXeroBadRequestException() { + Exception e = new Exception(); // XeroBadRequestException extends XeroException so we can catch either expectedException.expect(XeroException.class); - expectedException.expect(is(new XeroBadRequestException(objectType, error))); + expectedException.expect(is(new XeroBadRequestException(objectType, error, e))); - xeroApiExceptionHandler.validationError(objectType, error); + xeroApiExceptionHandler.validationError(objectType, error, e); } @Test public void testXeroMethodNotAllowedException() { + Exception e = new Exception(); // XeroMethodNotAllowedException extends XeroException so we can catch either expectedException.expect(XeroException.class); - expectedException.expect(is(new XeroMethodNotAllowedException(objectType, problem))); + expectedException.expect(is(new XeroMethodNotAllowedException(objectType, problem, e))); - xeroApiExceptionHandler.validationError(405, objectType, problem); + xeroApiExceptionHandler.validationError(405, objectType, problem, e); } @Test