Merge pull request #187 from XeroAPI/sid-development

Updates for OAS 2.0.3

Author: SidneyAllen

README.md

@@ -8,11 +8,11 @@ Version 3.x of Xero Java SDK only supports oAuth2 authentication and the followi
 * identity
 * bank feeds
 * fixed asset 
+* projects
 * payroll au (beta)
 
 Coming soon 
 * payroll nz/uk
-* projects
 * files 
 * xero hq
 

pom.xml

@@ -5,7 +5,7 @@
     <artifactId>xero-java</artifactId>
     <packaging>jar</packaging>
     <name>xero-java</name>
-    <version>3.3.2</version>
+    <version>3.4.0</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

@@ -90,7 +90,7 @@ public class AccountingApi {
     private ApiClient apiClient;
     private static AccountingApi instance = null;
     private String userAgent = "Default";
-    private String version = "3.3.2";
+    private String version = "3.4.0";
 
     public AccountingApi() {
         this(new ApiClient());
@@ -9698,6 +9698,65 @@ public HttpResponse getPurchaseOrderForHttpResponse(String accessToken,  String
         GenericUrl genericUrl = new GenericUrl(url);
 
 
+        HttpContent content = null;
+        Credential credential = new Credential(BearerToken.authorizationHeaderAccessMethod()).setAccessToken(accessToken);
+        HttpTransport transport = apiClient.getHttpTransport();       
+        HttpRequestFactory requestFactory = transport.createRequestFactory(credential);
+        return requestFactory.buildRequest(HttpMethods.GET, genericUrl, content).setHeaders(headers)
+            .setConnectTimeout(apiClient.getConnectionTimeout())
+            .setReadTimeout(apiClient.getReadTimeout()).execute();  
+    }
+
+  /**
+    * Allows you to retrieve a specified purchase orders
+    * <p><b>200</b> - Success - return response of type PurchaseOrder array for specified PurchaseOrder
+    * @param xeroTenantId Xero identifier for Tenant
+    * @param purchaseOrderNumber Unique identifier for a PurchaseOrder
+    * @param accessToken Authorization token for user set in header of each request
+    * @return PurchaseOrders
+    * @throws IOException if an error occurs while attempting to invoke the API
+    **/
+    public PurchaseOrders  getPurchaseOrderByNumber(String accessToken, String xeroTenantId, String purchaseOrderNumber) throws IOException {
+        try {
+            TypeReference<PurchaseOrders> typeRef = new TypeReference<PurchaseOrders>() {};
+            HttpResponse response = getPurchaseOrderByNumberForHttpResponse(accessToken, xeroTenantId, purchaseOrderNumber);
+            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 getPurchaseOrderByNumberForHttpResponse(String accessToken,  String xeroTenantId,  String purchaseOrderNumber) throws IOException {
+        // verify the required parameter 'xeroTenantId' is set
+        if (xeroTenantId == null) {
+            throw new IllegalArgumentException("Missing the required parameter 'xeroTenantId' when calling getPurchaseOrderByNumber");
+        }// verify the required parameter 'purchaseOrderNumber' is set
+        if (purchaseOrderNumber == null) {
+            throw new IllegalArgumentException("Missing the required parameter 'purchaseOrderNumber' when calling getPurchaseOrderByNumber");
+        }
+        if (accessToken == null) {
+            throw new IllegalArgumentException("Missing the required parameter 'accessToken' when calling getPurchaseOrderByNumber");
+        }
+        HttpHeaders headers = new HttpHeaders();
+        headers.set("xero-tenant-id", xeroTenantId);
+        headers.setAccept("application/json"); 
+        headers.setUserAgent(this.getUserAgent());
+        
+        String correctPath = "/PurchaseOrders/{PurchaseOrderNumber}";
+        
+        // create a map of path variables
+        final Map<String, Object> uriVariables = new HashMap<String, Object>();
+        uriVariables.put("PurchaseOrderNumber", purchaseOrderNumber);
+
+        UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + correctPath);
+        String url = uriBuilder.buildFromMap(uriVariables).toString();
+        GenericUrl genericUrl = new GenericUrl(url);
+
+        
         HttpContent content = null;
         Credential credential = new Credential(BearerToken.authorizationHeaderAccessMethod()).setAccessToken(accessToken);
         HttpTransport transport = apiClient.getHttpTransport();       

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.3.2";
+    private String version = "3.4.0";
 
     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.3.2";
+    private String version = "3.4.0";
 
     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.3.2";
+    private String version = "3.4.0";
 
     public IdentityApi() {
         this(new ApiClient());

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

@@ -8,6 +8,7 @@
 import com.xero.models.projects.ProjectPatch;
 import com.xero.models.projects.ProjectUsers;
 import com.xero.models.projects.Projects;
+import com.xero.models.projects.Task;
 import com.xero.models.projects.Tasks;
 import com.xero.models.projects.TimeEntries;
 import com.xero.models.projects.TimeEntry;
@@ -51,7 +52,7 @@ public class ProjectsApi {
     private ApiClient apiClient;
     private static ProjectsApi instance = null;
     private String userAgent = "Default";
-    private String version = "3.3.2";
+    private String version = "3.4.0";
 
     public ProjectsApi() {
         this(new ApiClient());
@@ -412,7 +413,7 @@ public HttpResponse getProjectUsersForHttpResponse(String accessToken,  String x
     * @return Projects
     * @throws IOException if an error occurs while attempting to invoke the API
     **/
-    public Projects  getProjects(String accessToken, String xeroTenantId, List<UUID> projectIds, UUID contactID, Projects states, Integer page, Integer pageSize) throws IOException {
+    public Projects  getProjects(String accessToken, String xeroTenantId, List<UUID> projectIds, UUID contactID, String states, Integer page, Integer pageSize) throws IOException {
         try {
             TypeReference<Projects> typeRef = new TypeReference<Projects>() {};
             HttpResponse response = getProjectsForHttpResponse(accessToken, xeroTenantId, projectIds, contactID, states, page, pageSize);
@@ -426,7 +427,7 @@ public Projects  getProjects(String accessToken, String xeroTenantId, List<UUID>
         return null;
     }
 
-    public HttpResponse getProjectsForHttpResponse(String accessToken,  String xeroTenantId,  List<UUID> projectIds,  UUID contactID,  Projects states,  Integer page,  Integer pageSize) throws IOException {
+    public HttpResponse getProjectsForHttpResponse(String accessToken,  String xeroTenantId,  List<UUID> projectIds,  UUID contactID,  String states,  Integer page,  Integer pageSize) throws IOException {
         // verify the required parameter 'xeroTenantId' is set
         if (xeroTenantId == null) {
             throw new IllegalArgumentException("Missing the required parameter 'xeroTenantId' when calling getProjects");
@@ -504,6 +505,70 @@ public HttpResponse getProjectsForHttpResponse(String accessToken,  String xeroT
             .setReadTimeout(apiClient.getReadTimeout()).execute();      
     }
 
+  /**
+    * Allows you to retrieve a single project
+    * Allows you to retrieve a specific project
+    * <p><b>200</b> - OK/success, returns a list of task objects
+    * @param xeroTenantId Xero identifier for Tenant
+    * @param projectId You can specify an individual project by appending the projectId to the endpoint
+    * @param taskId You can specify an individual task by appending the taskId to the endpoint, i.e. GET https://.../tasks/{taskId}
+    * @param accessToken Authorization token for user set in header of each request
+    * @return Task
+    * @throws IOException if an error occurs while attempting to invoke the API
+    **/
+    public Task  getTask(String accessToken, String xeroTenantId, UUID projectId, UUID taskId) throws IOException {
+        try {
+            TypeReference<Task> typeRef = new TypeReference<Task>() {};
+            HttpResponse response = getTaskForHttpResponse(accessToken, xeroTenantId, projectId, taskId);
+            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 getTaskForHttpResponse(String accessToken,  String xeroTenantId,  UUID projectId,  UUID taskId) throws IOException {
+        // verify the required parameter 'xeroTenantId' is set
+        if (xeroTenantId == null) {
+            throw new IllegalArgumentException("Missing the required parameter 'xeroTenantId' when calling getTask");
+        }// verify the required parameter 'projectId' is set
+        if (projectId == null) {
+            throw new IllegalArgumentException("Missing the required parameter 'projectId' when calling getTask");
+        }// verify the required parameter 'taskId' is set
+        if (taskId == null) {
+            throw new IllegalArgumentException("Missing the required parameter 'taskId' when calling getTask");
+        }
+        if (accessToken == null) {
+            throw new IllegalArgumentException("Missing the required parameter 'accessToken' when calling getTask");
+        }
+        HttpHeaders headers = new HttpHeaders();
+        headers.set("Xero-Tenant-Id", xeroTenantId);
+        headers.setAccept("application/json"); 
+        headers.setUserAgent(this.getUserAgent());
+        
+        String correctPath = "/projects/{projectId}/tasks/{taskId}";
+        
+        // create a map of path variables
+        final Map<String, Object> uriVariables = new HashMap<String, Object>();
+        uriVariables.put("projectId", projectId);
+        uriVariables.put("taskId", taskId);
+
+        UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + correctPath);
+        String url = uriBuilder.buildFromMap(uriVariables).toString();
+        GenericUrl genericUrl = new GenericUrl(url);
+        HttpContent content = null;
+        Credential credential = new Credential(BearerToken.authorizationHeaderAccessMethod()).setAccessToken(accessToken);
+        HttpTransport transport = apiClient.getHttpTransport();       
+        HttpRequestFactory requestFactory = transport.createRequestFactory(credential);
+        
+        return requestFactory.buildRequest(HttpMethods.GET, genericUrl, content).setHeaders(headers)
+            .setConnectTimeout(apiClient.getConnectionTimeout())
+            .setReadTimeout(apiClient.getReadTimeout()).execute();      
+    }
+
   /**
     * Allows you to retrieve a single project
     * Allows you to retrieve a specific project
@@ -512,7 +577,7 @@ public HttpResponse getProjectsForHttpResponse(String accessToken,  String xeroT
     * @param projectId You can specify an individual project by appending the projectId to the endpoint
     * @param page Set to 1 by default. The requested number of the page in paged response - Must be a number greater than 0.
     * @param pageSize Optional, it is set to 50 by default. The number of items to return per page in a paged response - Must be a number between 1 and 500.
-    * @param taskIds taskIdsSearch for all tasks that match a comma separated list of taskIds, i.e. GET https://.../tasks?taskIds&#x3D;{taskId},{taskId}
+    * @param taskIds taskIds Search for all tasks that match a comma separated list of taskIds, i.e. GET https://.../tasks?taskIds&#x3D;{taskId},{taskId}
     * @param accessToken Authorization token for user set in header of each request
     * @return Tasks
     * @throws IOException if an error occurs while attempting to invoke the API
@@ -609,15 +674,15 @@ public HttpResponse getTasksForHttpResponse(String accessToken,  String xeroTena
     * @param contactId Finds all time entries for this contact identifier.
     * @param page Set to 1 by default. The requested number of the page in paged response - Must be a number greater than 0.
     * @param pageSize Optional, it is set to 50 by default. The number of items to return per page in a paged response - Must be a number between 1 and 500.
-    * @param states Comma-separated list of states to find. Will find all time entries that are in the status of whatever’s specified.
+    * @param states Comma-separated list of states to find. Will find all time entries that are in the status of whatever’s specified. 
     * @param isChargeable Finds all time entries which relate to tasks with the charge type &#x60;TIME&#x60; or &#x60;FIXED&#x60;.
     * @param dateAfterUtc ISO 8601 UTC date. Finds all time entries on or after this date filtered on the &#x60;dateUtc&#x60; field.
     * @param dateBeforeUtc ISO 8601 UTC date. Finds all time entries on or before this date filtered on the &#x60;dateUtc&#x60; field.
     * @param accessToken Authorization token for user set in header of each request
     * @return TimeEntries
     * @throws IOException if an error occurs while attempting to invoke the API
     **/
-    public TimeEntries  getTimeEntries(String accessToken, String xeroTenantId, UUID projectId, UUID userId, UUID taskId, UUID invoiceId, UUID contactId, Integer page, Integer pageSize, String states, Boolean isChargeable, OffsetDateTime dateAfterUtc, OffsetDateTime dateBeforeUtc) throws IOException {
+    public TimeEntries  getTimeEntries(String accessToken, String xeroTenantId, UUID projectId, UUID userId, UUID taskId, UUID invoiceId, UUID contactId, Integer page, Integer pageSize, List<String> states, Boolean isChargeable, OffsetDateTime dateAfterUtc, OffsetDateTime dateBeforeUtc) throws IOException {
         try {
             TypeReference<TimeEntries> typeRef = new TypeReference<TimeEntries>() {};
             HttpResponse response = getTimeEntriesForHttpResponse(accessToken, xeroTenantId, projectId, userId, taskId, invoiceId, contactId, page, pageSize, states, isChargeable, dateAfterUtc, dateBeforeUtc);
@@ -631,7 +696,7 @@ public TimeEntries  getTimeEntries(String accessToken, String xeroTenantId, UUID
         return null;
     }
 
-    public HttpResponse getTimeEntriesForHttpResponse(String accessToken,  String xeroTenantId,  UUID projectId,  UUID userId,  UUID taskId,  UUID invoiceId,  UUID contactId,  Integer page,  Integer pageSize,  String states,  Boolean isChargeable,  OffsetDateTime dateAfterUtc,  OffsetDateTime dateBeforeUtc) throws IOException {
+    public HttpResponse getTimeEntriesForHttpResponse(String accessToken,  String xeroTenantId,  UUID projectId,  UUID userId,  UUID taskId,  UUID invoiceId,  UUID contactId,  Integer page,  Integer pageSize,  List<String> states,  Boolean isChargeable,  OffsetDateTime dateAfterUtc,  OffsetDateTime dateBeforeUtc) throws IOException {
         // verify the required parameter 'xeroTenantId' is set
         if (xeroTenantId == null) {
             throw new IllegalArgumentException("Missing the required parameter 'xeroTenantId' when calling getTimeEntries");

src/main/java/com/xero/models/accounting/Account.java

@@ -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.0.2
+ * The version of the OpenAPI document: 2.0.3
  * Contact: api@xero.com
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

src/main/java/com/xero/models/accounting/AccountType.java

@@ -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.0.2
+ * The version of the OpenAPI document: 2.0.3
  * Contact: api@xero.com
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

src/main/java/com/xero/models/accounting/Accounts.java

@@ -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.0.2
+ * The version of the OpenAPI document: 2.0.3
  * Contact: api@xero.com
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).