Merge pull request #181 from XeroAPI/sid-development

Update methods

Author: SidneyAllen

pom.xml

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

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

@@ -26,7 +26,6 @@
 import com.xero.models.accounting.HistoryRecords;
 import com.xero.models.accounting.InvoiceReminders;
 import com.xero.models.accounting.Invoices;
-import com.xero.models.accounting.Item;
 import com.xero.models.accounting.Items;
 import com.xero.models.accounting.Journals;
 import com.xero.models.accounting.LinkedTransaction;
@@ -94,7 +93,7 @@ public class AccountingApi {
     private ApiClient apiClient;
     private static AccountingApi instance = null;
     private String userAgent = "Default";
-    private String version = "3.2.1";
+    private String version = "3.2.2";
 
     public AccountingApi() {
         this(new ApiClient());
@@ -1951,63 +1950,6 @@ public HttpResponse createInvoicesForHttpResponse(String accessToken,  String xe
             .setReadTimeout(apiClient.getReadTimeout()).execute();  
     }
 
-  /**
-    * Allows you to create a single item
-    * <p><b>200</b> - Success - return response of type Items array with newly created Item
-    * <p><b>400</b> - A failed request due to validation error
-    * @param xeroTenantId Xero identifier for Tenant
-    * @param item The item parameter
-    * @param accessToken Authorization token for user set in header of each request
-    * @return Items
-    * @throws IOException if an error occurs while attempting to invoke the API
-    **/
-    public Items  createItem(String accessToken, String xeroTenantId, Item item) throws IOException {
-        try {
-            TypeReference<Items> typeRef = new TypeReference<Items>() {};
-            HttpResponse response = createItemForHttpResponse(accessToken, xeroTenantId, item);
-            return apiClient.getObjectMapper().readValue(response.getContent(), typeRef);
-        } catch (HttpResponseException e) {
-            XeroApiExceptionHandler handler = new XeroApiExceptionHandler();
-            handler.execute(e,apiClient);
-        } catch (IOException ioe) {
-            throw ioe;
-        }
-        return null;
-    }
-
-    public HttpResponse createItemForHttpResponse(String accessToken,  String xeroTenantId,  Item item) throws IOException {
-        // verify the required parameter 'xeroTenantId' is set
-        if (xeroTenantId == null) {
-            throw new IllegalArgumentException("Missing the required parameter 'xeroTenantId' when calling createItem");
-        }// verify the required parameter 'item' is set
-        if (item == null) {
-            throw new IllegalArgumentException("Missing the required parameter 'item' when calling createItem");
-        }
-        if (accessToken == null) {
-            throw new IllegalArgumentException("Missing the required parameter 'accessToken' when calling createItem");
-        }
-        HttpHeaders headers = new HttpHeaders();
-        headers.set("xero-tenant-id", xeroTenantId);
-        headers.setAccept("application/json"); 
-        headers.setUserAgent(this.getUserAgent());
-        
-        String correctPath = "/Items";
-        UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + correctPath);
-        String url = uriBuilder.build().toString();
-        GenericUrl genericUrl = new GenericUrl(url);
-
-        
-        HttpContent content = null;
-        content = apiClient.new JacksonJsonHttpContent(item);
-        
-        Credential credential = new Credential(BearerToken.authorizationHeaderAccessMethod()).setAccessToken(accessToken);
-        HttpTransport transport = apiClient.getHttpTransport();       
-        HttpRequestFactory requestFactory = transport.createRequestFactory(credential);
-        return requestFactory.buildRequest(HttpMethods.POST, genericUrl, content).setHeaders(headers)
-            .setConnectTimeout(apiClient.getConnectionTimeout())
-            .setReadTimeout(apiClient.getReadTimeout()).execute();  
-    }
-
   /**
     * Allows you to create a history record for items
     * <p><b>200</b> - Unsupported - return response incorrect exception, API is not able to create HistoryRecord for Items
@@ -11214,17 +11156,16 @@ public HttpResponse getReportBalanceSheetForHttpResponse(String accessToken,  St
     * Allows you to retrieve report for BankSummary
     * <p><b>200</b> - Success - return response of type ReportWithRows
     * @param xeroTenantId Xero identifier for Tenant
-    * @param date The date for the Bank Summary report e.g. 2018-03-31
-    * @param period The number of periods to compare (integer between 1 and 12)
-    * @param timeframe The period size to compare to (1&#x3D;month, 3&#x3D;quarter, 12&#x3D;year)
+    * @param fromDate The from date for the Bank Summary report e.g. 2018-03-31
+    * @param toDate The to date for the Bank Summary report e.g. 2018-03-31
     * @param accessToken Authorization token for user set in header of each request
     * @return ReportWithRows
     * @throws IOException if an error occurs while attempting to invoke the API
     **/
-    public ReportWithRows  getReportBankSummary(String accessToken, String xeroTenantId, LocalDate date, Integer period, Integer timeframe) throws IOException {
+    public ReportWithRows  getReportBankSummary(String accessToken, String xeroTenantId, LocalDate fromDate, LocalDate toDate) throws IOException {
         try {
             TypeReference<ReportWithRows> typeRef = new TypeReference<ReportWithRows>() {};
-            HttpResponse response = getReportBankSummaryForHttpResponse(accessToken, xeroTenantId, date, period, timeframe);
+            HttpResponse response = getReportBankSummaryForHttpResponse(accessToken, xeroTenantId, fromDate, toDate);
             return apiClient.getObjectMapper().readValue(response.getContent(), typeRef);
         } catch (HttpResponseException e) {
             XeroApiExceptionHandler handler = new XeroApiExceptionHandler();
@@ -11235,7 +11176,7 @@ public ReportWithRows  getReportBankSummary(String accessToken, String xeroTenan
         return null;
     }
 
-    public HttpResponse getReportBankSummaryForHttpResponse(String accessToken,  String xeroTenantId,  LocalDate date,  Integer period,  Integer timeframe) throws IOException {
+    public HttpResponse getReportBankSummaryForHttpResponse(String accessToken,  String xeroTenantId,  LocalDate fromDate,  LocalDate toDate) throws IOException {
         // verify the required parameter 'xeroTenantId' is set
         if (xeroTenantId == null) {
             throw new IllegalArgumentException("Missing the required parameter 'xeroTenantId' when calling getReportBankSummary");
@@ -11250,29 +11191,19 @@ public HttpResponse getReportBankSummaryForHttpResponse(String accessToken,  Str
 
         String correctPath = "/Reports/BankSummary";
         UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + correctPath);
-        if (date != null) {
-            String key = "date";
-            Object value = date;
-            if (value instanceof Collection) {
-                uriBuilder = uriBuilder.queryParam(key, ((Collection) value).toArray());
-            } else if (value instanceof Object[]) {
-                uriBuilder = uriBuilder.queryParam(key, (Object[]) value);
-            } else {
-                uriBuilder = uriBuilder.queryParam(key, value);
-            }
-        }        if (period != null) {
-            String key = "period";
-            Object value = period;
+        if (fromDate != null) {
+            String key = "fromDate";
+            Object value = fromDate;
             if (value instanceof Collection) {
                 uriBuilder = uriBuilder.queryParam(key, ((Collection) value).toArray());
             } else if (value instanceof Object[]) {
                 uriBuilder = uriBuilder.queryParam(key, (Object[]) value);
             } else {
                 uriBuilder = uriBuilder.queryParam(key, value);
             }
-        }        if (timeframe != null) {
-            String key = "timeframe";
-            Object value = timeframe;
+        }        if (toDate != null) {
+            String key = "toDate";
+            Object value = toDate;
             if (value instanceof Collection) {
                 uriBuilder = uriBuilder.queryParam(key, ((Collection) value).toArray());
             } else if (value instanceof Object[]) {
@@ -13595,6 +13526,75 @@ public HttpResponse updateOrCreateInvoicesForHttpResponse(String accessToken,  S
             .setReadTimeout(apiClient.getReadTimeout()).execute();  
     }
 
+  /**
+    * Allows you to update or create one or more items
+    * <p><b>200</b> - Success - return response of type Items array with newly created Item
+    * <p><b>400</b> - A failed request due to validation error
+    * @param xeroTenantId Xero identifier for Tenant
+    * @param items The items parameter
+    * @param summarizeErrors response format that shows validation errors for each bank transaction
+    * @param accessToken Authorization token for user set in header of each request
+    * @return Items
+    * @throws IOException if an error occurs while attempting to invoke the API
+    **/
+    public Items  updateOrCreateItems(String accessToken, String xeroTenantId, Items items, Boolean summarizeErrors) throws IOException {
+        try {
+            TypeReference<Items> typeRef = new TypeReference<Items>() {};
+            HttpResponse response = updateOrCreateItemsForHttpResponse(accessToken, xeroTenantId, items, summarizeErrors);
+            return apiClient.getObjectMapper().readValue(response.getContent(), typeRef);
+        } catch (HttpResponseException e) {
+            XeroApiExceptionHandler handler = new XeroApiExceptionHandler();
+            handler.execute(e,apiClient);
+        } catch (IOException ioe) {
+            throw ioe;
+        }
+        return null;
+    }
+
+    public HttpResponse updateOrCreateItemsForHttpResponse(String accessToken,  String xeroTenantId,  Items items,  Boolean summarizeErrors) throws IOException {
+        // verify the required parameter 'xeroTenantId' is set
+        if (xeroTenantId == null) {
+            throw new IllegalArgumentException("Missing the required parameter 'xeroTenantId' when calling updateOrCreateItems");
+        }// verify the required parameter 'items' is set
+        if (items == null) {
+            throw new IllegalArgumentException("Missing the required parameter 'items' when calling updateOrCreateItems");
+        }
+        if (accessToken == null) {
+            throw new IllegalArgumentException("Missing the required parameter 'accessToken' when calling updateOrCreateItems");
+        }
+        HttpHeaders headers = new HttpHeaders();
+        headers.set("xero-tenant-id", xeroTenantId);
+        headers.setAccept("application/json"); 
+        headers.setUserAgent(this.getUserAgent());
+        
+        String correctPath = "/Items";
+        UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + correctPath);
+        if (summarizeErrors != null) {
+            String key = "summarizeErrors";
+            Object value = summarizeErrors;
+            if (value instanceof Collection) {
+                uriBuilder = uriBuilder.queryParam(key, ((Collection) value).toArray());
+            } else if (value instanceof Object[]) {
+                uriBuilder = uriBuilder.queryParam(key, (Object[]) value);
+            } else {
+                uriBuilder = uriBuilder.queryParam(key, value);
+            }
+        }
+        String url = uriBuilder.build().toString();
+        GenericUrl genericUrl = new GenericUrl(url);
+
+        
+        HttpContent content = null;
+        content = apiClient.new JacksonJsonHttpContent(items);
+        
+        Credential credential = new Credential(BearerToken.authorizationHeaderAccessMethod()).setAccessToken(accessToken);
+        HttpTransport transport = apiClient.getHttpTransport();       
+        HttpRequestFactory requestFactory = transport.createRequestFactory(credential);
+        return requestFactory.buildRequest(HttpMethods.POST, genericUrl, content).setHeaders(headers)
+            .setConnectTimeout(apiClient.getConnectionTimeout())
+            .setReadTimeout(apiClient.getReadTimeout()).execute();  
+    }
+
   /**
     * Allows you to update or create one or more purchase orders
     * <p><b>200</b> - Success - return response of type PurchaseOrder array for specified PurchaseOrder

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

@@ -44,7 +44,7 @@ public class AssetApi {
     private ApiClient apiClient;
     private static AssetApi instance = null;
     private String userAgent = "Default";
-    private String version = "3.2.1";
+    private String version = "3.2.2";
 
     public AssetApi() {
         this(new ApiClient());

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

@@ -45,7 +45,7 @@ public class BankFeedsApi {
     private ApiClient apiClient;
     private static BankFeedsApi instance = null;
     private String userAgent = "Default";
-    private String version = "3.2.1";
+    private String version = "3.2.2";
 
     public BankFeedsApi() {
         this(new ApiClient());

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

@@ -41,7 +41,7 @@ public class IdentityApi {
     private ApiClient apiClient;
     private static IdentityApi instance = null;
     private String userAgent = "Default";
-    private String version = "3.2.1";
+    private String version = "3.2.2";
 
     public IdentityApi() {
         this(new ApiClient());

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

@@ -59,7 +59,7 @@ public class PayrollAuApi {
     private ApiClient apiClient;
     private static PayrollAuApi instance = null;
     private String userAgent = "Default";
-    private String version = "3.2.1";
+    private String version = "3.2.2";
 
     public PayrollAuApi() {
         this(new ApiClient());

src/test/java/com/xero/api/client/AccountingApiItemsTest.java

@@ -85,8 +85,8 @@ public void tearDown() {
     @Test
     public void createItemTest() throws IOException {
         System.out.println("@Test - createItem");
-        Item item = new Item();
-        Items response = accountingApi.createItem(accessToken,xeroTenantId,item);
+        Items items = new Items();
+        Items response = accountingApi.updateOrCreateItems(accessToken,xeroTenantId,items,false);
 
         assertThat(response.getItems().get(0).getCode(), is(equalTo("abc65591")));
         assertThat(response.getItems().get(0).getName(), is(equalTo("Hello11350")));

src/test/java/com/xero/api/client/AccountingApiReportsTest.java

@@ -186,11 +186,10 @@ public void getReportBalanceSheetTest() throws IOException {
     @Test
     public void getReportBankSummaryTest() throws IOException {
         System.out.println("@Test - getReportBankSummary");
-        LocalDate date = null;
-        Integer period = null;
-        Integer timeframe = null;
+        LocalDate toDate = null;
+        LocalDate fromDate = null;  
 
-        ReportWithRows response = accountingApi.getReportBankSummary(accessToken,xeroTenantId,date, period, timeframe);
+        ReportWithRows response = accountingApi.getReportBankSummary(accessToken,xeroTenantId,fromDate, toDate );
         assertThat(response.getReports().get(0).getReportID(), is(equalTo("BankSummary")));
         assertThat(response.getReports().get(0).getReportName(), is(equalTo("Bank Summary")));
         assertThat(response.getReports().get(0).getReportType(), is("BankSummary"));
@@ -396,4 +395,4 @@ public void getReportBASorGSTListTest() throws IOException {
         // TODO: test validations
         //System.out.println(response.getReports().get(0).toString());
     }
-}
+}