Merge pull request #194 from XeroAPI/sid-development

Updates to Accounting and Assets v2.0.7 of OAS

Author: SidneyAllen

pom.xml

@@ -5,7 +5,7 @@
     <artifactId>xero-java</artifactId>
     <packaging>jar</packaging>
     <name>xero-java</name>
-    <version>3.5.0</version>
+    <version>3.5.1</version>
     <url>https://github.com/XeroAPI/Xero-Java</url>
     <description>This is the official Java SDK for Xero API</description>
     <licenses>
@@ -87,7 +87,6 @@
 	       <artifactId>log4j-core</artifactId>
 	       <version>2.11.0</version>
 	   	</dependency>
-           
 	    <!-- JSON processing: jackson -->
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>

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

@@ -91,7 +91,7 @@ public class AccountingApi {
     private ApiClient apiClient;
     private static AccountingApi instance = null;
     private String userAgent = "Default";
-    private String version = "3.5.0";
+    private String version = "3.5.1";
 
     public AccountingApi() {
         this(new ApiClient());
@@ -9986,6 +9986,74 @@ public HttpResponse getQuoteForHttpResponse(String accessToken,  String xeroTena
         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 quotes as PDF files
+    * <p><b>200</b> - Success - return response of byte array pdf version of specified Quotes
+    * @param xeroTenantId Xero identifier for Tenant
+    * @param quoteID Unique identifier for an Quote
+    * @param accessToken Authorization token for user set in header of each request
+    * @return File
+    * @throws IOException if an error occurs while attempting to invoke the API
+    **/
+    public ByteArrayInputStream  getQuoteAsPdf(String accessToken, String xeroTenantId, UUID quoteID) throws IOException {
+        try {
+            TypeReference<File> typeRef = new TypeReference<File>() {};
+            HttpResponse response = getQuoteAsPdfForHttpResponse(accessToken, xeroTenantId, quoteID);
+            InputStream is = response.getContent();
+            return convertInputToByteArray(is);
+
+        } catch (HttpResponseException e) {
+            XeroApiExceptionHandler handler = new XeroApiExceptionHandler();
+            handler.execute(e,apiClient);
+        } catch (IOException ioe) {
+            throw ioe;
+        }
+        return null;
+    }
+
+    public HttpResponse getQuoteAsPdfForHttpResponse(String accessToken,  String xeroTenantId,  UUID quoteID) throws IOException {
+        // verify the required parameter 'xeroTenantId' is set
+        if (xeroTenantId == null) {
+            throw new IllegalArgumentException("Missing the required parameter 'xeroTenantId' when calling getQuoteAsPdf");
+        }// verify the required parameter 'quoteID' is set
+        if (quoteID == null) {
+            throw new IllegalArgumentException("Missing the required parameter 'quoteID' when calling getQuoteAsPdf");
+        }
+        if (accessToken == null) {
+            throw new IllegalArgumentException("Missing the required parameter 'accessToken' when calling getQuoteAsPdf");
+        }
+        HttpHeaders headers = new HttpHeaders();
+        headers.set("xero-tenant-id", xeroTenantId);
+        headers.setAccept("application/json"); 
+        headers.setUserAgent(this.getUserAgent());
+        
+        String correctPath = "/Quotes/{QuotesID}/pdf";
+        
+        // Hacky path manipulation to support different return types from same endpoint
+        String path = "/Quotes/{QuotesID}/pdf";
+        String type = "/pdf";
+        if(path.toLowerCase().contains(type.toLowerCase())) {
+            correctPath = path.replace("/pdf","");
+            headers.setAccept("application/pdf"); 
+        }
+        // create a map of path variables
+        final Map<String, Object> uriVariables = new HashMap<String, Object>();
+        uriVariables.put("QuoteID", quoteID);
+
+        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();       
@@ -13268,72 +13336,6 @@ public HttpResponse updateCreditNoteAttachmentByFileNameForHttpResponse(String a
             .setReadTimeout(apiClient.getReadTimeout()).execute();  
     }
 
-  /**
-    * Allows you to update a specific employee used in Xero payrun
-    * <p><b>200</b> - Success - return response of type Employees array with updated Employee
-    * <p><b>400</b> - A failed request due to validation error
-    * @param xeroTenantId Xero identifier for Tenant
-    * @param employeeID Unique identifier for a Employee
-    * @param employees The employees parameter
-    * @param accessToken Authorization token for user set in header of each request
-    * @return Employees
-    * @throws IOException if an error occurs while attempting to invoke the API
-    **/
-    public Employees  updateEmployee(String accessToken, String xeroTenantId, UUID employeeID, Employees employees) throws IOException {
-        try {
-            TypeReference<Employees> typeRef = new TypeReference<Employees>() {};
-            HttpResponse response = updateEmployeeForHttpResponse(accessToken, xeroTenantId, employeeID, employees);
-            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 updateEmployeeForHttpResponse(String accessToken,  String xeroTenantId,  UUID employeeID,  Employees employees) throws IOException {
-        // verify the required parameter 'xeroTenantId' is set
-        if (xeroTenantId == null) {
-            throw new IllegalArgumentException("Missing the required parameter 'xeroTenantId' when calling updateEmployee");
-        }// verify the required parameter 'employeeID' is set
-        if (employeeID == null) {
-            throw new IllegalArgumentException("Missing the required parameter 'employeeID' when calling updateEmployee");
-        }// verify the required parameter 'employees' is set
-        if (employees == null) {
-            throw new IllegalArgumentException("Missing the required parameter 'employees' when calling updateEmployee");
-        }
-        if (accessToken == null) {
-            throw new IllegalArgumentException("Missing the required parameter 'accessToken' when calling updateEmployee");
-        }
-        HttpHeaders headers = new HttpHeaders();
-        headers.set("xero-tenant-id", xeroTenantId);
-        headers.setAccept("application/json"); 
-        headers.setUserAgent(this.getUserAgent());
-        
-        String correctPath = "/Employees/{EmployeeID}";
-        
-        // create a map of path variables
-        final Map<String, Object> uriVariables = new HashMap<String, Object>();
-        uriVariables.put("EmployeeID", employeeID);
-
-        UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + correctPath);
-        String url = uriBuilder.buildFromMap(uriVariables).toString();
-        GenericUrl genericUrl = new GenericUrl(url);
-
-        
-        HttpContent content = null;
-        content = apiClient.new JacksonJsonHttpContent(employees);
-        
-        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 specified expense claims
     * <p><b>200</b> - Success - return response of type ExpenseClaims array with updated ExpenseClaim

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

@@ -2,6 +2,7 @@
 import com.xero.api.ApiClient;
 
 import com.xero.models.assets.Asset;
+import com.xero.models.assets.AssetStatus;
 import com.xero.models.assets.AssetType;
 import com.xero.models.assets.Assets;
 import com.xero.models.assets.Setting;
@@ -44,7 +45,7 @@ public class AssetApi {
     private ApiClient apiClient;
     private static AssetApi instance = null;
     private String userAgent = "Default";
-    private String version = "3.5.0";
+    private String version = "3.5.1";
 
     public AssetApi() {
         this(new ApiClient());
@@ -365,7 +366,7 @@ public HttpResponse getAssetTypesForHttpResponse(String accessToken,  String xer
     * @return Assets
     * @throws IOException if an error occurs while attempting to invoke the API
     **/
-    public Assets  getAssets(String accessToken, String xeroTenantId, String status, Integer page, Integer pageSize, String orderBy, String sortDirection, String filterBy) throws IOException {
+    public Assets  getAssets(String accessToken, String xeroTenantId, AssetStatus status, Integer page, Integer pageSize, String orderBy, String sortDirection, String filterBy) throws IOException {
         try {
             TypeReference<Assets> typeRef = new TypeReference<Assets>() {};
             HttpResponse response = getAssetsForHttpResponse(accessToken, xeroTenantId, status, page, pageSize, orderBy, sortDirection, filterBy);
@@ -379,7 +380,7 @@ public Assets  getAssets(String accessToken, String xeroTenantId, String status,
         return null;
     }
 
-    public HttpResponse getAssetsForHttpResponse(String accessToken,  String xeroTenantId,  String status,  Integer page,  Integer pageSize,  String orderBy,  String sortDirection,  String filterBy) throws IOException {
+    public HttpResponse getAssetsForHttpResponse(String accessToken,  String xeroTenantId,  AssetStatus status,  Integer page,  Integer pageSize,  String orderBy,  String sortDirection,  String filterBy) throws IOException {
         // verify the required parameter 'xeroTenantId' is set
         if (xeroTenantId == null) {
             throw new IllegalArgumentException("Missing the required parameter 'xeroTenantId' when calling getAssets");

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.5.0";
+    private String version = "3.5.1";
 
     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.5.0";
+    private String version = "3.5.1";
 
     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.5.0";
+    private String version = "3.5.1";
 
     public PayrollAuApi() {
         this(new ApiClient());

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

@@ -52,7 +52,7 @@ public class ProjectApi {
     private ApiClient apiClient;
     private static ProjectApi instance = null;
     private String userAgent = "Default";
-    private String version = "3.5.0";
+    private String version = "3.5.1";
 
     public ProjectApi() {
         this(new ApiClient());

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.5
+ * The version of the OpenAPI document: 2.0.7
  * Contact: api@xero.com
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -302,7 +302,7 @@ public static SystemAccountEnum fromValue(String value) {
 
 
   @JsonProperty("HasAttachments")
-  private Boolean hasAttachments;
+  private Boolean hasAttachments = false;
 
   @JsonDeserialize(using = com.xero.api.CustomOffsetDateTimeDeserializer.class)
   @JsonProperty("UpdatedDateUTC")
@@ -571,7 +571,7 @@ public String getReportingCodeName() {
    * boolean to indicate if an account has an attachment (read only)
    * @return hasAttachments
   **/
-  @ApiModelProperty(value = "boolean to indicate if an account has an attachment (read only)")
+  @ApiModelProperty(example = "false", value = "boolean to indicate if an account has an attachment (read only)")
   public Boolean getHasAttachments() {
     return hasAttachments;
   }

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