Skip to content

Commit 2d5114f

Browse files
SidneyAllenSidneyAllen
authored
Merge pull request #204 from XeroAPI/sid-development
Fix the logging dependency
2 parents b0d911b + a0e499b commit 2d5114f

File tree

9 files changed

+27
-62
lines changed

9 files changed

+27
-62
lines changed

‎pom.xml‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<artifactId>xero-java</artifactId>
66
<packaging>jar</packaging>
77
<name>xero-java</name>
8-
<version>4.0.0</version>
8+
<version>4.0.1</version>
99
<url>https://github.com/XeroAPI/Xero-Java</url>
1010
<description>This is the official Java SDK for Xero API</description>
1111
<licenses>
@@ -78,20 +78,11 @@
7878
<scope>test</scope>
7979
</dependency>
8080
<dependency>
81-
<groupId>org.apache.logging.log4j</groupId>
82-
<artifactId>log4j-api</artifactId>
83-
<version>2.7</version>
84-
</dependency>
85-
<dependency>
86-
<groupId>org.apache.logging.log4j</groupId>
87-
<artifactId>log4j-core</artifactId>
88-
<version>2.7</version>
89-
</dependency>
90-
<dependency>
91-
<groupId>org.apache.logging.log4j</groupId>
92-
<artifactId>log4j-slf4j-impl</artifactId>
93-
<version>2.7</version>
81+
<groupId>org.slf4j</groupId>
82+
<artifactId>slf4j-api</artifactId>
83+
<version>1.7.30</version>
9484
</dependency>
85+
9586
<!-- JSON processing: jackson -->
9687
<dependency>
9788
<groupId>com.fasterxml.jackson.core</groupId>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public class AccountingApi {
9393
private ApiClient apiClient;
9494
private static AccountingApi instance = null;
9595
private String userAgent = "Default";
96-
private String version = "4.0.0";
96+
private String version = "4.0.1";
9797
final static Logger logger = LoggerFactory.getLogger(AccountingApi.class);
9898

9999
public AccountingApi() {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public class AssetApi {
4747
private ApiClient apiClient;
4848
private static AssetApi instance = null;
4949
private String userAgent = "Default";
50-
private String version = "4.0.0";
50+
private String version = "4.0.1";
5151
final static Logger logger = LoggerFactory.getLogger(AssetApi.class);
5252

5353
public AssetApi() {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public class BankFeedsApi {
4747
private ApiClient apiClient;
4848
private static BankFeedsApi instance = null;
4949
private String userAgent = "Default";
50-
private String version = "4.0.0";
50+
private String version = "4.0.1";
5151
final static Logger logger = LoggerFactory.getLogger(BankFeedsApi.class);
5252

5353
public BankFeedsApi() {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public class IdentityApi {
4343
private ApiClient apiClient;
4444
private static IdentityApi instance = null;
4545
private String userAgent = "Default";
46-
private String version = "4.0.0";
46+
private String version = "4.0.1";
4747
final static Logger logger = LoggerFactory.getLogger(IdentityApi.class);
4848

4949
public IdentityApi() {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public class PayrollAuApi {
6363
private ApiClient apiClient;
6464
private static PayrollAuApi instance = null;
6565
private String userAgent = "Default";
66-
private String version = "4.0.0";
66+
private String version = "4.0.1";
6767
final static Logger logger = LoggerFactory.getLogger(PayrollAuApi.class);
6868

6969
public PayrollAuApi() {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public class PayrollUkApi {
104104
private ApiClient apiClient;
105105
private static PayrollUkApi instance = null;
106106
private String userAgent = "Default";
107-
private String version = "4.0.0";
107+
private String version = "4.0.1";
108108
final static Logger logger = LoggerFactory.getLogger(PayrollUkApi.class);
109109

110110
public PayrollUkApi() {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public class ProjectApi {
5454
private ApiClient apiClient;
5555
private static ProjectApi instance = null;
5656
private String userAgent = "Default";
57-
private String version = "4.0.0";
57+
private String version = "4.0.1";
5858
final static Logger logger = LoggerFactory.getLogger(ProjectApi.class);
5959

6060
public ProjectApi() {

‎src/test/java/com/xero/api/client/PayrollAuApiPayslipTest.java‎

Lines changed: 15 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -113,54 +113,28 @@ public void getPayslipTest() throws IOException {
113113
}
114114

115115
@Test
116-
public void updatePayslipByIDTest() throws IOException {
117-
System.out.println("@Test - updatePayslipByIDTest");
116+
public void updatePayslipTest() throws IOException {
117+
System.out.println("@Test - updatePayslipDTest");
118118

119119
UUID payslipId = UUID.fromString("cdfb8371-0b21-4b8a-8903-1024df6c391e");
120-
List<PayslipLines> payslipObject = new ArrayList<>();
121-
PayslipObject response = payrollAuApi.updatePayslip(accessToken, xeroTenantId, payslipId, payslipObject);
120+
List<com.xero.models.payrollau.PayslipLines> payslipObject = new ArrayList<>();
121+
com.xero.models.payrollau.Payslips response = payrollAuApi.updatePayslip(accessToken, xeroTenantId, payslipId, payslipObject);
122122

123123
// Can not write test until I can
124124
// make the call and get a live response back for the OAS to use
125125

126126

127-
//assertThat(response.getPayslip().getEmployeeID(), is(equalTo(UUID.fromString("78bb86b9-e1ea-47ac-b75d-f087a81931de"))));
128-
//assertThat(response.getPayslip().getPayslipID(), is(equalTo(UUID.fromString("c81e8bcc-56b0-4740-b46b-767753a6ee45"))));
129-
130-
// assertThat(response.getPayslip().getFirstName(), is(equalTo("Albus")));
131-
// assertThat(response.getPayslip().getLastName(), is(equalTo("Dumbledore")));
132-
// assertThat(response.getPayslip().getTax(), is(equalTo(0.0f)));
133-
// assertThat(response.getPayslip().getNetPay(), is(equalTo(1.4f)));
134-
// assertThat(response.getPayslip().getEarningsLines().get(0).getEarningsRateID(), is(equalTo(UUID.fromString("ab874dfb-ab09-4c91-954e-43acf6fc23b4"))));
135-
// assertThat(response.getPayslip().getEarningsLines().get(0).getRatePerUnit(), is(equalTo(3.0f)));
136-
// assertThat(response.getPayslip().getEarningsLines().get(0).getNumberOfUnits(), is(equalTo(1.8f)));
137-
// assertThat(response.getPayslip().getLeaveEarningsLines().get(0).getEarningsRateID(), is(equalTo(UUID.fromString("ab874dfb-ab09-4c91-954e-43acf6fc23b4"))));
138-
// assertThat(response.getPayslip().getLeaveEarningsLines().get(0).getRatePerUnit(), is(equalTo(0.0f)));
139-
// assertThat(response.getPayslip().getLeaveEarningsLines().get(0).getNumberOfUnits(), is(equalTo(0.6f)));
140-
// assertThat(response.getPayslip().getDeductionLines().get(0).getDeductionTypeID() , is(equalTo(UUID.fromString("ed05ea82-e40a-4eb6-9c2e-4b3c03e7e938"))));
141-
// assertThat(response.getPayslip().getDeductionLines().get(0).getAmount() , is(equalTo(4.0f)));
142-
// assertThat(response.getPayslip().getDeductionLines().get(0).getCalculationType() , is(equalTo(com.xero.models.payrollau.DeductionTypeCalculationType.FIXEDAMOUNT)));
143-
// assertThat(response.getPayslip().getLeaveAccrualLines().get(0).getLeaveTypeID() , is(equalTo(UUID.fromString("184ea8f7-d143-46dd-bef3-0c60e1aa6fca"))));
144-
// assertThat(response.getPayslip().getLeaveAccrualLines().get(0).getNumberOfUnits(), is(equalTo(0.0769f)));
145-
// assertThat(response.getPayslip().getLeaveAccrualLines().get(0).getAutoCalculate(), is(equalTo(true)));
146-
// assertThat(response.getPayslip().getReimbursementLines().get(0).getReimbursementTypeID() , is(equalTo(UUID.fromString("aa8cfa40-d872-4be0-8a94-bb7f00962f74"))));
147-
// assertThat(response.getPayslip().getReimbursementLines().get(0).getAmount(), is(equalTo(55.0f)));
148-
// assertThat(response.getPayslip().getReimbursementLines().get(0).getDescription(), is(equalTo("boo")));
149-
// assertThat(response.getPayslip().getReimbursementLines().get(0).getExpenseAccount(), is(equalTo("850")));
150-
// //assertThat(response.getPayslip().getSuperannuationLines().get(0).getReimbursementTypeID() , is(equalTo(UUID.fromString("aa8cfa40-d872-4be0-8a94-bb7f00962f74"))));
151-
// assertThat(response.getPayslip().getSuperannuationLines().get(0).getContributionType(), is(equalTo(com.xero.models.payrollau.SuperannuationContributionType.SGC)));
152-
// assertThat(response.getPayslip().getSuperannuationLines().get(0).getCalculationType(), is(equalTo(com.xero.models.payrollau.SuperannuationCalculationType.STATUTORY)));
153-
// assertThat(response.getPayslip().getSuperannuationLines().get(0).getMinimumMonthlyEarnings(), is(equalTo(450.0f)));
154-
// assertThat(response.getPayslip().getSuperannuationLines().get(0).getExpenseAccountCode(), is(equalTo("478")));
155-
// assertThat(response.getPayslip().getSuperannuationLines().get(0).getLiabilityAccountCode(), is(equalTo("826")));
156-
// assertThat(response.getPayslip().getSuperannuationLines().get(0).getPaymentDateForThisPeriodAsDate(), is(equalTo(LocalDate.of(2020,01,27))));
157-
// assertThat(response.getPayslip().getSuperannuationLines().get(0).getAmount(), is(equalTo(0.0f)));
158-
// assertThat(response.getPayslip().getTaxLines().get(0).getAmount(), is(equalTo(0.0f)));
159-
// assertThat(response.getPayslip().getTaxLines().get(0).getTaxTypeName(), is(equalTo("PAYG Tax")));
160-
// assertThat(response.getPayslip().getTaxLines().get(0).getDescription(), is(equalTo("No tax file number (Australian resident)")));
161-
// assertThat(response.getPayslip().getTaxLines().get(0).getLiabilityAccount(), is(equalTo("825")));
162-
// assertThat(response.getPayslip().getUpdatedDateUTCAsDate(), is(equalTo(OffsetDateTime.parse("2019-11-13T16:42:35-08:00"))));
163-
// System.out.println(response.toString());
127+
assertThat(response.getPayslips().get(0).getEmployeeID(), is(equalTo(UUID.fromString("cdfb8371-0b21-4b8a-8903-1024df6c391e"))));
128+
assertThat(response.getPayslips().get(0).getPayslipID(), is(equalTo(UUID.fromString("c81e8bcc-56b0-4740-b46b-767753a6ee45"))));
129+
assertThat(response.getPayslips().get(0).getFirstName(), is(equalTo("Albus")));
130+
assertThat(response.getPayslips().get(0).getLastName(), is(equalTo("Dumbledore")));
131+
assertThat(response.getPayslips().get(0).getTax(), is(equalTo(0.0f)));
132+
assertThat(response.getPayslips().get(0).getNetPay(), is(equalTo(1.4f)));
133+
assertThat(response.getPayslips().get(0).getDeductionLines().get(0).getDeductionTypeID() , is(equalTo(UUID.fromString("ed05ea82-e40a-4eb6-9c2e-4b3c03e7e938"))));
134+
assertThat(response.getPayslips().get(0).getDeductionLines().get(0).getAmount() , is(equalTo(4.0f)));
135+
assertThat(response.getPayslips().get(0).getDeductionLines().get(0).getCalculationType() , is(equalTo(com.xero.models.payrollau.DeductionTypeCalculationType.FIXEDAMOUNT)));
136+
assertThat(response.getPayslips().get(0).getUpdatedDateUTCAsDate(), is(equalTo(OffsetDateTime.parse("2020-05-15T18:44:13.735Z"))));
137+
//System.out.println(response.toString());
164138
}
165139

166140
}

0 commit comments

Comments
 (0)