Skip to content

Commit

Permalink
Merge pull request #225 from XeroAPI/sid-development
Browse files Browse the repository at this point in the history
Version 4.2.0 build
  • Loading branch information
SidneyAllen authored Aug 25, 2020
2 parents 1606012 + edd4bb7 commit 6b6b146
Show file tree
Hide file tree
Showing 347 changed files with 423 additions and 403 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<artifactId>xero-java</artifactId>
<packaging>jar</packaging>
<name>xero-java</name>
<version>4.1.4</version>
<version>4.2.0</version>
<url>https://github.com/XeroAPI/Xero-Java</url>
<description>This is the official Java SDK for Xero API</description>
<licenses>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/xero/api/client/AccountingApi.java
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public class AccountingApi {
private ApiClient apiClient;
private static AccountingApi instance = null;
private String userAgent = "Default";
private String version = "4.1.4";
private String version = "4.2.0";
static final Logger logger = LoggerFactory.getLogger(AccountingApi.class);

public AccountingApi() {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/xero/api/client/AssetApi.java
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public class AssetApi {
private ApiClient apiClient;
private static AssetApi instance = null;
private String userAgent = "Default";
private String version = "4.1.4";
private String version = "4.2.0";
static final Logger logger = LoggerFactory.getLogger(AssetApi.class);

public AssetApi() {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/xero/api/client/BankFeedsApi.java
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public class BankFeedsApi {
private ApiClient apiClient;
private static BankFeedsApi instance = null;
private String userAgent = "Default";
private String version = "4.1.4";
private String version = "4.2.0";
static final Logger logger = LoggerFactory.getLogger(BankFeedsApi.class);

public BankFeedsApi() {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/xero/api/client/IdentityApi.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public class IdentityApi {
private ApiClient apiClient;
private static IdentityApi instance = null;
private String userAgent = "Default";
private String version = "4.1.4";
private String version = "4.2.0";
static final Logger logger = LoggerFactory.getLogger(IdentityApi.class);

public IdentityApi() {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/xero/api/client/PayrollAuApi.java
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public class PayrollAuApi {
private ApiClient apiClient;
private static PayrollAuApi instance = null;
private String userAgent = "Default";
private String version = "4.1.4";
private String version = "4.2.0";
static final Logger logger = LoggerFactory.getLogger(PayrollAuApi.class);

public PayrollAuApi() {
Expand Down
16 changes: 8 additions & 8 deletions src/main/java/com/xero/api/client/PayrollUkApi.java
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public class PayrollUkApi {
private ApiClient apiClient;
private static PayrollUkApi instance = null;
private String userAgent = "Default";
private String version = "4.1.4";
private String version = "4.2.0";
static final Logger logger = LoggerFactory.getLogger(PayrollUkApi.class);

public PayrollUkApi() {
Expand Down Expand Up @@ -5068,18 +5068,18 @@ public HttpResponse getPaySlipForHttpResponse(
* @return Payslips
* @throws IOException if an error occurs while attempting to invoke the API
*/
public Payslips getPayslips(String accessToken, String xeroTenantId, UUID payRunID, Integer page)
public Payslips getPaySlips(String accessToken, String xeroTenantId, UUID payRunID, Integer page)
throws IOException {
try {
TypeReference<Payslips> typeRef = new TypeReference<Payslips>() {};
HttpResponse response = getPayslipsForHttpResponse(accessToken, xeroTenantId, payRunID, page);
HttpResponse response = getPaySlipsForHttpResponse(accessToken, xeroTenantId, payRunID, page);
return apiClient.getObjectMapper().readValue(response.getContent(), typeRef);
} catch (HttpResponseException e) {
if (logger.isDebugEnabled()) {
logger.debug(
"------------------ HttpResponseException "
+ e.getStatusCode()
+ " : getPayslips -------------------");
+ " : getPaySlips -------------------");
logger.debug(e.toString());
}
XeroApiExceptionHandler handler = new XeroApiExceptionHandler();
Expand All @@ -5096,20 +5096,20 @@ public Payslips getPayslips(String accessToken, String xeroTenantId, UUID payRun
return null;
}

public HttpResponse getPayslipsForHttpResponse(
public HttpResponse getPaySlipsForHttpResponse(
String accessToken, String xeroTenantId, UUID payRunID, Integer page) throws IOException {
// verify the required parameter 'xeroTenantId' is set
if (xeroTenantId == null) {
throw new IllegalArgumentException(
"Missing the required parameter 'xeroTenantId' when calling getPayslips");
"Missing the required parameter 'xeroTenantId' when calling getPaySlips");
} // verify the required parameter 'payRunID' is set
if (payRunID == null) {
throw new IllegalArgumentException(
"Missing the required parameter 'payRunID' when calling getPayslips");
"Missing the required parameter 'payRunID' when calling getPaySlips");
}
if (accessToken == null) {
throw new IllegalArgumentException(
"Missing the required parameter 'accessToken' when calling getPayslips");
"Missing the required parameter 'accessToken' when calling getPaySlips");
}
HttpHeaders headers = new HttpHeaders();
headers.set("Xero-Tenant-Id", xeroTenantId);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/xero/api/client/ProjectApi.java
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public class ProjectApi {
private ApiClient apiClient;
private static ProjectApi instance = null;
private String userAgent = "Default";
private String version = "4.1.4";
private String version = "4.2.0";
static final Logger logger = LoggerFactory.getLogger(ProjectApi.class);

public ProjectApi() {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/xero/models/accounting/Account.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Accounting API
* No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
*
* The version of the OpenAPI document: 2.2.10
* The version of the OpenAPI document: 2.2.13
* Contact: [email protected]
*
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/xero/models/accounting/AccountType.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Accounting API
* No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
*
* The version of the OpenAPI document: 2.2.10
* The version of the OpenAPI document: 2.2.13
* Contact: [email protected]
*
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/xero/models/accounting/Accounts.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Accounting API
* No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
*
* The version of the OpenAPI document: 2.2.10
* The version of the OpenAPI document: 2.2.13
* Contact: [email protected]
*
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Accounting API
* No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
*
* The version of the OpenAPI document: 2.2.10
* The version of the OpenAPI document: 2.2.13
* Contact: [email protected]
*
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Accounting API
* No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
*
* The version of the OpenAPI document: 2.2.10
* The version of the OpenAPI document: 2.2.13
* Contact: [email protected]
*
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/xero/models/accounting/Address.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Accounting API
* No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
*
* The version of the OpenAPI document: 2.2.10
* The version of the OpenAPI document: 2.2.13
* Contact: [email protected]
*
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/xero/models/accounting/Allocation.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Accounting API
* No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
*
* The version of the OpenAPI document: 2.2.10
* The version of the OpenAPI document: 2.2.13
* Contact: [email protected]
*
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/xero/models/accounting/Allocations.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Accounting API
* No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
*
* The version of the OpenAPI document: 2.2.10
* The version of the OpenAPI document: 2.2.13
* Contact: [email protected]
*
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
Expand Down
11 changes: 5 additions & 6 deletions src/main/java/com/xero/models/accounting/Attachment.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Accounting API
* No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
*
* The version of the OpenAPI document: 2.2.10
* The version of the OpenAPI document: 2.2.13
* Contact: [email protected]
*
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
Expand All @@ -15,7 +15,6 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import com.xero.api.StringUtil;
import io.swagger.annotations.ApiModelProperty;
import java.math.BigDecimal;
import java.util.Objects;
import java.util.UUID;

Expand All @@ -36,7 +35,7 @@ public class Attachment {
private String mimeType;

@JsonProperty("ContentLength")
private BigDecimal contentLength;
private Integer contentLength;

@JsonProperty("IncludeOnline")
private Boolean includeOnline;
Expand Down Expand Up @@ -122,7 +121,7 @@ public void setMimeType(String mimeType) {
this.mimeType = mimeType;
}

public Attachment contentLength(BigDecimal contentLength) {
public Attachment contentLength(Integer contentLength) {
this.contentLength = contentLength;
return this;
}
Expand All @@ -133,11 +132,11 @@ public Attachment contentLength(BigDecimal contentLength) {
* @return contentLength
*/
@ApiModelProperty(value = "Length of the file content")
public BigDecimal getContentLength() {
public Integer getContentLength() {
return contentLength;
}

public void setContentLength(BigDecimal contentLength) {
public void setContentLength(Integer contentLength) {
this.contentLength = contentLength;
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/xero/models/accounting/Attachments.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Accounting API
* No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
*
* The version of the OpenAPI document: 2.2.10
* The version of the OpenAPI document: 2.2.13
* Contact: [email protected]
*
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/xero/models/accounting/Balances.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Accounting API
* No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
*
* The version of the OpenAPI document: 2.2.10
* The version of the OpenAPI document: 2.2.13
* Contact: [email protected]
*
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/xero/models/accounting/BankTransaction.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Accounting API
* No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
*
* The version of the OpenAPI document: 2.2.10
* The version of the OpenAPI document: 2.2.13
* Contact: [email protected]
*
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
Expand Down Expand Up @@ -204,7 +204,7 @@ public BankTransaction contact(Contact contact) {
*
* @return contact
*/
@ApiModelProperty(required = true, value = "")
@ApiModelProperty(value = "")
public Contact getContact() {
return contact;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Accounting API
* No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
*
* The version of the OpenAPI document: 2.2.10
* The version of the OpenAPI document: 2.2.13
* Contact: [email protected]
*
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/xero/models/accounting/BankTransfer.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Accounting API
* No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
*
* The version of the OpenAPI document: 2.2.10
* The version of the OpenAPI document: 2.2.13
* Contact: [email protected]
*
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Accounting API
* No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
*
* The version of the OpenAPI document: 2.2.10
* The version of the OpenAPI document: 2.2.13
* Contact: [email protected]
*
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/xero/models/accounting/BatchPayment.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Accounting API
* No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
*
* The version of the OpenAPI document: 2.2.10
* The version of the OpenAPI document: 2.2.13
* Contact: [email protected]
*
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Accounting API
* No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
*
* The version of the OpenAPI document: 2.2.10
* The version of the OpenAPI document: 2.2.13
* Contact: [email protected]
*
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Accounting API
* No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
*
* The version of the OpenAPI document: 2.2.10
* The version of the OpenAPI document: 2.2.13
* Contact: [email protected]
*
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/xero/models/accounting/Bill.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Accounting API
* No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
*
* The version of the OpenAPI document: 2.2.10
* The version of the OpenAPI document: 2.2.13
* Contact: [email protected]
*
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Accounting API
* No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
*
* The version of the OpenAPI document: 2.2.10
* The version of the OpenAPI document: 2.2.13
* Contact: [email protected]
*
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Accounting API
* No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
*
* The version of the OpenAPI document: 2.2.10
* The version of the OpenAPI document: 2.2.13
* Contact: [email protected]
*
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Accounting API
* No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
*
* The version of the OpenAPI document: 2.2.10
* The version of the OpenAPI document: 2.2.13
* Contact: [email protected]
*
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/xero/models/accounting/CISSetting.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Accounting API
* No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
*
* The version of the OpenAPI document: 2.2.10
* The version of the OpenAPI document: 2.2.13
* Contact: [email protected]
*
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/xero/models/accounting/CISSettings.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Accounting API
* No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
*
* The version of the OpenAPI document: 2.2.10
* The version of the OpenAPI document: 2.2.13
* Contact: [email protected]
*
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/xero/models/accounting/Contact.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Accounting API
* No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
*
* The version of the OpenAPI document: 2.2.10
* The version of the OpenAPI document: 2.2.13
* Contact: [email protected]
*
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
Expand Down
Loading

0 comments on commit 6b6b146

Please sign in to comment.