Merge pull request #233 from XeroAPI/sid-development

Fix Quotes Unit test and adjust POM.XML

Author: SidneyAllen

pom.xml

@@ -5,7 +5,7 @@
     <artifactId>xero-java</artifactId>
     <packaging>jar</packaging>
     <name>xero-java</name>
-    <version>4.3.0</version>
+    <version>4.3.1</version>
     <url>https://github.com/XeroAPI/Xero-Java</url>
     <description>This is the official Java SDK for Xero API</description>
     <licenses>
@@ -73,7 +73,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>2.8.47</version>
+            <version>3.5.13</version>
             <scope>test</scope>
         </dependency>
 
@@ -228,6 +228,9 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
 				<version>2.9.1</version>
+				<configuration>
+					<source>8</source>
+				</configuration>
 				<executions>
 					<execution>
 						<id>attach-javadocs</id>

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

@@ -83,7 +83,7 @@ public class AccountingApi {
   private ApiClient apiClient;
   private static AccountingApi instance = null;
   private String userAgent = "Default";
-  private String version = "4.3.0";
+  private String version = "4.3.1";
   static final Logger logger = LoggerFactory.getLogger(AccountingApi.class);
 
   public AccountingApi() {
@@ -16098,6 +16098,8 @@ public HttpResponse getQuoteHistoryForHttpResponse(
    * @param page e.g. page=1 – Up to 100 Quotes will be returned in a single API call with line
    *     items shown for each quote
    * @param order Order by an any element
+   * @param quoteNumber Filter by quote number (e.g. GET
+   *     https://.../Quotes?QuoteNumber=QU-0001)
    * @param accessToken Authorization token for user set in header of each request
    * @return Quotes
    * @throws IOException if an error occurs while attempting to invoke the API
@@ -16113,7 +16115,8 @@ public Quotes getQuotes(
       UUID contactID,
       String status,
       Integer page,
-      String order)
+      String order,
+      String quoteNumber)
       throws IOException {
     try {
       TypeReference<Quotes> typeRef = new TypeReference<Quotes>() {};
@@ -16129,7 +16132,8 @@ public Quotes getQuotes(
               contactID,
               status,
               page,
-              order);
+              order,
+              quoteNumber);
       return apiClient.getObjectMapper().readValue(response.getContent(), typeRef);
     } catch (HttpResponseException e) {
       if (logger.isDebugEnabled()) {
@@ -16158,7 +16162,8 @@ public HttpResponse getQuotesForHttpResponse(
       UUID contactID,
       String status,
       Integer page,
-      String order)
+      String order,
+      String quoteNumber)
       throws IOException {
     // verify the required parameter 'xeroTenantId' is set
     if (xeroTenantId == null) {
@@ -16265,6 +16270,17 @@ public HttpResponse getQuotesForHttpResponse(
         uriBuilder = uriBuilder.queryParam(key, value);
       }
     }
+    if (quoteNumber != null) {
+      String key = "QuoteNumber";
+      Object value = quoteNumber;
+      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);
     if (logger.isDebugEnabled()) {

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

@@ -35,7 +35,7 @@ public class AssetApi {
   private ApiClient apiClient;
   private static AssetApi instance = null;
   private String userAgent = "Default";
-  private String version = "4.3.0";
+  private String version = "4.3.1";
   static final Logger logger = LoggerFactory.getLogger(AssetApi.class);
 
   public AssetApi() {
@@ -128,7 +128,7 @@ public HttpResponse createAssetForHttpResponse(
           "Missing the required parameter 'accessToken' when calling createAsset");
     }
     HttpHeaders headers = new HttpHeaders();
-    headers.set("Xero-Tenant-Id", xeroTenantId);
+    headers.set("xero-tenant-id", xeroTenantId);
     headers.setAccept("application/json");
     headers.setUserAgent(this.getUserAgent());
     UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/Assets");
@@ -210,7 +210,7 @@ public HttpResponse createAssetTypeForHttpResponse(
           "Missing the required parameter 'accessToken' when calling createAssetType");
     }
     HttpHeaders headers = new HttpHeaders();
-    headers.set("Xero-Tenant-Id", xeroTenantId);
+    headers.set("xero-tenant-id", xeroTenantId);
     headers.setAccept("application/json");
     headers.setUserAgent(this.getUserAgent());
     UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/AssetTypes");
@@ -286,7 +286,7 @@ public HttpResponse getAssetByIdForHttpResponse(String accessToken, String xeroT
           "Missing the required parameter 'accessToken' when calling getAssetById");
     }
     HttpHeaders headers = new HttpHeaders();
-    headers.set("Xero-Tenant-Id", xeroTenantId);
+    headers.set("xero-tenant-id", xeroTenantId);
     headers.setAccept("application/json");
     headers.setUserAgent(this.getUserAgent());
     // create a map of path variables
@@ -359,7 +359,7 @@ public HttpResponse getAssetSettingsForHttpResponse(String accessToken, String x
           "Missing the required parameter 'accessToken' when calling getAssetSettings");
     }
     HttpHeaders headers = new HttpHeaders();
-    headers.set("Xero-Tenant-Id", xeroTenantId);
+    headers.set("xero-tenant-id", xeroTenantId);
     headers.setAccept("application/json");
     headers.setUserAgent(this.getUserAgent());
     UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/Settings");
@@ -428,7 +428,7 @@ public HttpResponse getAssetTypesForHttpResponse(String accessToken, String xero
           "Missing the required parameter 'accessToken' when calling getAssetTypes");
     }
     HttpHeaders headers = new HttpHeaders();
-    headers.set("Xero-Tenant-Id", xeroTenantId);
+    headers.set("xero-tenant-id", xeroTenantId);
     headers.setAccept("application/json");
     headers.setUserAgent(this.getUserAgent());
     UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/AssetTypes");
@@ -532,7 +532,7 @@ public HttpResponse getAssetsForHttpResponse(
           "Missing the required parameter 'accessToken' when calling getAssets");
     }
     HttpHeaders headers = new HttpHeaders();
-    headers.set("Xero-Tenant-Id", xeroTenantId);
+    headers.set("xero-tenant-id", xeroTenantId);
     headers.setAccept("application/json");
     headers.setUserAgent(this.getUserAgent());
     UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/Assets");

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

@@ -33,7 +33,7 @@ public class BankFeedsApi {
   private ApiClient apiClient;
   private static BankFeedsApi instance = null;
   private String userAgent = "Default";
-  private String version = "4.3.0";
+  private String version = "4.3.1";
   static final Logger logger = LoggerFactory.getLogger(BankFeedsApi.class);
 
   public BankFeedsApi() {

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

@@ -31,7 +31,7 @@ public class IdentityApi {
   private ApiClient apiClient;
   private static IdentityApi instance = null;
   private String userAgent = "Default";
-  private String version = "4.3.0";
+  private String version = "4.3.1";
   static final Logger logger = LoggerFactory.getLogger(IdentityApi.class);
 
   public IdentityApi() {

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

@@ -50,7 +50,7 @@ public class PayrollAuApi {
   private ApiClient apiClient;
   private static PayrollAuApi instance = null;
   private String userAgent = "Default";
-  private String version = "4.3.0";
+  private String version = "4.3.1";
   static final Logger logger = LoggerFactory.getLogger(PayrollAuApi.class);
 
   public PayrollAuApi() {

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

@@ -92,7 +92,7 @@ public class PayrollNzApi {
   private ApiClient apiClient;
   private static PayrollNzApi instance = null;
   private String userAgent = "Default";
-  private String version = "4.3.0";
+  private String version = "4.3.1";
   static final Logger logger = LoggerFactory.getLogger(PayrollNzApi.class);
 
   public PayrollNzApi() {

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

@@ -92,7 +92,7 @@ public class PayrollUkApi {
   private ApiClient apiClient;
   private static PayrollUkApi instance = null;
   private String userAgent = "Default";
-  private String version = "4.3.0";
+  private String version = "4.3.1";
   static final Logger logger = LoggerFactory.getLogger(PayrollUkApi.class);
 
   public PayrollUkApi() {

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

@@ -41,7 +41,7 @@ public class ProjectApi {
   private ApiClient apiClient;
   private static ProjectApi instance = null;
   private String userAgent = "Default";
-  private String version = "4.3.0";
+  private String version = "4.3.1";
   static final Logger logger = LoggerFactory.getLogger(ProjectApi.class);
 
   public ProjectApi() {

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.3.0
+ * The version of the OpenAPI document: 2.3.3
  * Contact: [email protected]
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).