Skip to content

Commit cd2d4a1

Browse files
SidneyAllenSidneyAllen
committed
Fix issue by removing sample config.json files
Feedback that config.json files included in the SDK causing problems - need to update Test cases to use a CustomJsonConfig instead.
1 parent 859e2af commit cd2d4a1

6 files changed

Lines changed: 21 additions & 27 deletions

File tree

‎src/main/java/com/xero/example/CustomJsonConfig.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
public class CustomJsonConfig implements Config {
99

10-
private String APP_TYPE = "PARTNER";
10+
private String APP_TYPE = "PUBLIC";
1111
private String USER_AGENT = "Xero-Java-SDK";
1212
private String ACCEPT = "application/xml";
1313
private String CONSUMER_KEY = "YOUR_CONSUMER_KEY";

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,10 @@
1717

1818
import com.xero.api.XeroApiException;
1919
import com.xero.api.ApiClient;
20-
import com.xero.api.Config;
21-
import com.xero.api.JsonConfig;
2220
import com.xero.api.client.*;
2321
import com.xero.models.accounting.*;
2422

23+
import com.xero.example.CustomJsonConfig;
2524
import com.xero.example.SampleData;
2625

2726
import org.threeten.bp.*;
@@ -42,7 +41,7 @@
4241

4342
public class AccountingApiAccountsTest {
4443

45-
Config config;
44+
CustomJsonConfig config;
4645

4746
ApiClient apiClientForAccounting;
4847
AccountingApi accountingApi;
@@ -61,7 +60,7 @@ public class AccountingApiAccountsTest {
6160
UUID accountID;
6261
@Before
6362
public void setUp() {
64-
config = JsonConfig.getInstance();
63+
config = new CustomJsonConfig();
6564
apiClientForAccounting = new ApiClient("https://virtserver.swaggerhub.com/Xero/accounting/2.0.0",null,null,null);
6665
accountingApi = new AccountingApi(config);
6766
accountingApi.setApiClient(apiClientForAccounting);
@@ -157,7 +156,7 @@ public void testGetAccountAttachments() throws Exception {
157156
public void testCreateAccountAttachmentByFileName() throws Exception {
158157
System.out.println("@Test - createAccountAttachmentByFileName");
159158

160-
InputStream inputStream = JsonConfig.class.getResourceAsStream("/helo-heros.jpg");
159+
InputStream inputStream = CustomJsonConfig.class.getResourceAsStream("/helo-heros.jpg");
161160
byte[] bytes = IOUtils.toByteArray(inputStream);
162161
String newFileName = "sample5.jpg";
163162
Attachments createAccountsAttachments = accountingApi.createAccountAttachmentByFileName(accountID, newFileName, bytes);
@@ -172,7 +171,7 @@ public void testCreateAccountAttachmentByFileName() throws Exception {
172171
public void testUpdateAccountAttachmentByFileName() throws Exception {
173172
System.out.println("@Test - updateAccountAttachmentByFileName");
174173

175-
InputStream inputStream = JsonConfig.class.getResourceAsStream("/helo-heros.jpg");
174+
InputStream inputStream = CustomJsonConfig.class.getResourceAsStream("/helo-heros.jpg");
176175
byte[] bytes = IOUtils.toByteArray(inputStream);
177176
String newFileName = "sample5.jpg";
178177
Attachments createAccountsAttachments = accountingApi.updateAccountAttachmentByFileName(accountID, newFileName, bytes);

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,9 @@
1818

1919
import com.xero.api.XeroApiException;
2020
import com.xero.api.ApiClient;
21-
import com.xero.api.Config;
22-
import com.xero.api.JsonConfig;
2321
import com.xero.api.client.*;
2422
import com.xero.models.accounting.*;
25-
23+
import com.xero.example.CustomJsonConfig;
2624
import com.xero.example.SampleData;
2725

2826
import org.threeten.bp.*;
@@ -46,7 +44,7 @@
4644

4745
public class AccountingApiBankTransactionTest {
4846

49-
Config config;
47+
CustomJsonConfig config;
5048

5149
ApiClient apiClientForAccounting;
5250
AccountingApi api;
@@ -65,7 +63,7 @@ public class AccountingApiBankTransactionTest {
6563
UUID bankTransactionID;
6664
@Before
6765
public void setUp() {
68-
config = JsonConfig.getInstance();
66+
config = new CustomJsonConfig();
6967
apiClientForAccounting = new ApiClient("https://virtserver.swaggerhub.com/Xero/accounting/2.0.0",null,null,null);
7068
api = new AccountingApi(config);
7169
api.setApiClient(apiClientForAccounting);
@@ -180,7 +178,7 @@ public void testCreateBankTransaction() throws Exception {
180178

181179
@Test
182180
public void createBankTransactionAttachmentByFileNameTest() throws IOException {
183-
InputStream inputStream = JsonConfig.class.getResourceAsStream("/helo-heros.jpg");
181+
InputStream inputStream = CustomJsonConfig.class.getResourceAsStream("/helo-heros.jpg");
184182
byte[] body = IOUtils.toByteArray(inputStream);
185183
String fileName = "sample5.jpg";
186184

@@ -208,7 +206,7 @@ public void getBankTransactionAttachmentsTest() throws IOException {
208206

209207
@Test
210208
public void updateBankTransactionAttachmentByFileNameTest() throws IOException {
211-
InputStream inputStream = JsonConfig.class.getResourceAsStream("/helo-heros.jpg");
209+
InputStream inputStream = CustomJsonConfig.class.getResourceAsStream("/helo-heros.jpg");
212210
byte[] body = IOUtils.toByteArray(inputStream);
213211
String fileName = "sample5.jpg";
214212

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
import com.xero.api.XeroApiException;
2020
import com.xero.api.ApiClient;
21-
import com.xero.api.Config;
22-
import com.xero.api.JsonConfig;
21+
import com.xero.example.CustomJsonConfig;
22+
2323
import com.xero.api.client.*;
2424
import com.xero.models.accounting.*;
2525

@@ -46,7 +46,7 @@
4646

4747
public class AccountingApiBankTransferTest {
4848

49-
Config config;
49+
CustomJsonConfig config;
5050

5151
ApiClient apiClientForAccounting;
5252
AccountingApi api;
@@ -65,7 +65,7 @@ public class AccountingApiBankTransferTest {
6565
UUID bankTransferID;
6666
@Before
6767
public void setUp() {
68-
config = JsonConfig.getInstance();
68+
config = new CustomJsonConfig();
6969
apiClientForAccounting = new ApiClient("https://virtserver.swaggerhub.com/Xero/accounting/2.0.0",null,null,null);
7070
api = new AccountingApi(config);
7171
api.setApiClient(apiClientForAccounting);

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,11 @@
1717

1818
import com.xero.api.XeroApiException;
1919
import com.xero.api.ApiClient;
20-
import com.xero.api.Config;
21-
import com.xero.api.JsonConfig;
2220
import com.xero.api.client.*;
2321
import com.xero.models.accounting.*;
2422

2523
import com.xero.example.SampleData;
24+
import com.xero.example.CustomJsonConfig;
2625

2726
import org.threeten.bp.*;
2827
import java.io.IOException;
@@ -41,8 +40,7 @@
4140
import org.apache.commons.io.IOUtils;
4241

4342
public class AccountingApiBatchPaymentTest {
44-
45-
Config config;
43+
CustomJsonConfig config;
4644

4745
ApiClient apiClientForAccounting;
4846
AccountingApi accountingApi;
@@ -61,7 +59,7 @@ public class AccountingApiBatchPaymentTest {
6159
UUID batchPaymentID;
6260
@Before
6361
public void setUp() {
64-
config = JsonConfig.getInstance();
62+
config = new CustomJsonConfig();
6563
apiClientForAccounting = new ApiClient("https://virtserver.swaggerhub.com/Xero/accounting/2.0.0",null,null,null);
6664
accountingApi = new AccountingApi(config);
6765
accountingApi.setApiClient(apiClientForAccounting);

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,11 @@
1717

1818
import com.xero.api.XeroApiException;
1919
import com.xero.api.ApiClient;
20-
import com.xero.api.Config;
21-
import com.xero.api.JsonConfig;
2220
import com.xero.api.client.*;
2321
import com.xero.models.accounting.*;
2422

2523
import com.xero.example.SampleData;
24+
import com.xero.example.CustomJsonConfig;
2625

2726
import org.threeten.bp.*;
2827
import java.io.IOException;
@@ -42,7 +41,7 @@
4241

4342
public class AccountingApiBrandingThemeTest {
4443

45-
Config config;
44+
CustomJsonConfig config;
4645

4746
ApiClient apiClientForAccounting;
4847
AccountingApi accountingApi;
@@ -62,7 +61,7 @@ public class AccountingApiBrandingThemeTest {
6261
UUID paymentServiceId;
6362
@Before
6463
public void setUp() {
65-
config = JsonConfig.getInstance();
64+
config = new CustomJsonConfig();
6665
apiClientForAccounting = new ApiClient("https://virtserver.swaggerhub.com/Xero/accounting/2.0.0",null,null,null);
6766
accountingApi = new AccountingApi(config);
6867
accountingApi.setApiClient(apiClientForAccounting);

0 commit comments

Comments
 (0)