Fix OrgId, RowType and update README

Added missing OrganisationID from the Organisation Endpoint
Refactored RowType to be separate object
Use new RowType object for ReportRow and ReportRow properties
Update custom RSA SIgning example in README

Author: SidneyAllen

README.md

@@ -29,15 +29,20 @@ ApiClient apiClientForAccounting = new ApiClient(config.getApiUrl(),null,null,nu
 AccountingApi accountingApi = new AccountingApi(apiClientForAccounting);
 accountingApi.setOAuthToken(token, tokenSecret);
 
-// Fixed Assets API endpoints
-ApiClient apiClientForAssets = new ApiClient(config.getAssetsUrl(),null,null,null);
-AssetApi assetApi = new AssetApi(apiClientForAssets);
-assetApi.setOAuthToken(token, tokenSecret);
-
 // BankFeeds API endpoints (for approved Partners)
 ApiClient apiClientForBankFeeds = new ApiClient(config.getBankFeedsUrl(),null,null,null);
 BankFeedsApi bankFeedsApi = new BankFeedsApi(apiClientForBankFeeds);
 bankFeedsApi.setOAuthToken(token, tokenSecret);
+
+// Files API endpoints
+ApiClient apiClientForFiles = new ApiClient(config.getFilesUrl(),null,null,null);
+FilesApi filesApi = new FilesApi(apiClientForFiles);
+filesApi.setOAuthToken(token, tokenSecret);
+
+// Fixed Assets API endpoints
+ApiClient apiClientForAssets = new ApiClient(config.getAssetsUrl(),null,null,null);
+AssetApi assetApi = new AssetApi(apiClientForAssets);
+assetApi.setOAuthToken(token, tokenSecret);
 ```
 
 ### Making API calls will change as well.
@@ -74,7 +79,7 @@ Add the dependency to your pom.xml.  Gradle, sbt and other build tools can be fo
     <dependency>
       <groupId>com.github.xeroapi</groupId>
       <artifactId>xero-java</artifactId>
-      <version>2.2.11</version>
+      <version>2.2.12</version>
 	</dependency>
 
 
@@ -205,6 +210,20 @@ You can provide your own signing mechanism by using the `public AccountingApi(Co
 
 You can also provide a `RsaSignerFactory` using the `public RsaSignerFactory(InputStream privateKeyInputStream, String privateKeyPassword)` constructor to fetch keys from any InputStream.
 
+```java
+config = new JsonConfig("xero/config.json");
+
+try (FileInputStream privateKeyStream = new FileInputStream(config.getPathToPrivateKey()))
+{
+	RsaSignerFactory signerFactory = new RsaSignerFactory(privateKeyStream, config.getPrivateKeyPassword());
+
+		// v2
+	ApiClient apiClientForAccounting = new ApiClient(config.getApiUrl(), null, null, null);
+	accountingApi = new AccountingApi(config, signerFactory);
+	accountingApi.setApiClient(apiClientForAccounting);
+	accountingApi.setOAuthToken(config.getConsumerKey(), config.getConsumerSecret());
+}
+```
 
 ## Logging
 The SDK uses log4j2.  To configure, add a log4j.properties file to the Resources directory.

pom.xml

@@ -4,7 +4,7 @@
 	<groupId>com.github.xeroapi</groupId>
 	<artifactId>xero-java</artifactId>
 	<packaging>jar</packaging>
-	<version>2.2.11</version>
+	<version>2.2.12</version>
 	<name>Xero-Java SDK</name>
 	<description>This is the official Java SDK for Xero API</description>
 	<url>https://github.com/XeroAPI/Xero-Java</url>

src/main/java/com/xero/api/JsonConfig.java

@@ -132,7 +132,7 @@ public String getAccessTokenUrl() {
 
   @Override
   public String getUserAgent() {
-    return USER_AGENT + " " + CONSUMER_KEY + " [Xero-Java-2.2.11]";
+    return USER_AGENT + " " + CONSUMER_KEY + " [Xero-Java-2.2.12]";
   }
 
   @Override

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

@@ -29,6 +29,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.UUID;
 import org.threeten.bp.LocalDate;
 import org.threeten.bp.OffsetDateTime;
 
@@ -40,6 +41,10 @@
 
 public class Organisation {
 
+  @JsonProperty("OrganisationID")
+  private UUID organisationID = null;
+
+  
   @JsonProperty("APIKey")
   private String apIKey = null;
 
@@ -463,6 +468,24 @@ public static PropertyClassEnum fromValue(String text) {
   @JsonProperty("PaymentTerms")
   private PaymentTerm paymentTerms = null;
 
+  public Organisation organisationID(UUID organisationID) {
+    this.organisationID = organisationID;
+    return this;
+  }
+
+   /**
+   * Unique Xero identifier
+   * @return organisationID
+  **/
+  @ApiModelProperty(example = "8be9db36-3598-4755-ba5c-c2dbc8c4a7a2", value = "Unique Xero identifier")
+  public UUID getOrganisationID() {
+    return organisationID;
+  }
+
+  public void setOrganisationID(UUID organisationID) {
+    this.organisationID = organisationID;
+  }
+
   public Organisation apIKey(String apIKey) {
     this.apIKey = apIKey;
     return this;
@@ -1037,7 +1060,8 @@ public boolean equals(java.lang.Object o) {
       return false;
     }
     Organisation organisation = (Organisation) o;
-    return Objects.equals(this.apIKey, organisation.apIKey) &&
+    return Objects.equals(this.organisationID, organisation.organisationID) &&
+        Objects.equals(this.apIKey, organisation.apIKey) &&
         Objects.equals(this.name, organisation.name) &&
         Objects.equals(this.legalName, organisation.legalName) &&
         Objects.equals(this.paysTax, organisation.paysTax) &&
@@ -1071,7 +1095,7 @@ public boolean equals(java.lang.Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(apIKey, name, legalName, paysTax, version, organisationType, baseCurrency, countryCode, isDemoCompany, organisationStatus, registrationNumber, taxNumber, financialYearEndDay, financialYearEndMonth, salesTaxBasis, salesTaxPeriod, defaultSalesTax, defaultPurchasesTax, periodLockDate, endOfYearLockDate, createdDateUTC, timezone, organisationEntityType, shortCode, propertyClass, lineOfBusiness, addresses, phones, externalLinks, paymentTerms);
+    return Objects.hash(organisationID, apIKey, name, legalName, paysTax, version, organisationType, baseCurrency, countryCode, isDemoCompany, organisationStatus, registrationNumber, taxNumber, financialYearEndDay, financialYearEndMonth, salesTaxBasis, salesTaxPeriod, defaultSalesTax, defaultPurchasesTax, periodLockDate, endOfYearLockDate, createdDateUTC, timezone, organisationEntityType, shortCode, propertyClass, lineOfBusiness, addresses, phones, externalLinks, paymentTerms);
   }
 
 
@@ -1080,6 +1104,7 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class Organisation {\n");
 
+    sb.append("    organisationID: ").append(toIndentedString(organisationID)).append("\n");
     sb.append("    apIKey: ").append(toIndentedString(apIKey)).append("\n");
     sb.append("    name: ").append(toIndentedString(name)).append("\n");
     sb.append("    legalName: ").append(toIndentedString(legalName)).append("\n");

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

@@ -19,6 +19,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 import com.xero.models.accounting.ReportCell;
+import com.xero.models.accounting.RowType;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.ArrayList;
@@ -31,48 +32,9 @@
  */
 
 public class ReportRow {
-  /**
-   * Gets or Sets rowType
-   */
-  public enum RowTypeEnum {
-    HEADER("HEADER"),
-    
-    SECTION("SECTION"),
-    
-    ROW("ROW"),
-    
-    EMPTY("");
-
-    private String value;
-
-    RowTypeEnum(String value) {
-      this.value = value;
-    }
-
-    @JsonValue
-    public String getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static RowTypeEnum fromValue(String text) {
-      for (RowTypeEnum b : RowTypeEnum.values()) {
-        if (String.valueOf(b.value).equals(text)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + text + "'");
-    }
-  }
-
 
   @JsonProperty("RowType")
-  private RowTypeEnum rowType = null;
+  private RowType rowType = null;
 
 
   @JsonProperty("Title")
@@ -82,7 +44,7 @@ public static RowTypeEnum fromValue(String text) {
   @JsonProperty("Cells")
   private List<ReportCell> cells = null;
 
-  public ReportRow rowType(RowTypeEnum rowType) {
+  public ReportRow rowType(RowType rowType) {
     this.rowType = rowType;
     return this;
   }
@@ -92,11 +54,11 @@ public ReportRow rowType(RowTypeEnum rowType) {
    * @return rowType
   **/
   @ApiModelProperty(value = "")
-  public RowTypeEnum getRowType() {
+  public RowType getRowType() {
     return rowType;
   }
 
-  public void setRowType(RowTypeEnum rowType) {
+  public void setRowType(RowType rowType) {
     this.rowType = rowType;
   }
 

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

@@ -20,6 +20,7 @@
 import com.fasterxml.jackson.annotation.JsonValue;
 import com.xero.models.accounting.ReportCell;
 import com.xero.models.accounting.ReportRow;
+import com.xero.models.accounting.RowType;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.ArrayList;
@@ -34,7 +35,7 @@
 public class ReportRows {
 
   @JsonProperty("RowType")
-  private String rowType = null;
+  private RowType rowType = null;
 
 
   @JsonProperty("Title")
@@ -48,7 +49,7 @@ public class ReportRows {
   @JsonProperty("Rows")
   private List<ReportRow> rows = null;
 
-  public ReportRows rowType(String rowType) {
+  public ReportRows rowType(RowType rowType) {
     this.rowType = rowType;
     return this;
   }
@@ -58,11 +59,11 @@ public ReportRows rowType(String rowType) {
    * @return rowType
   **/
   @ApiModelProperty(value = "")
-  public String getRowType() {
+  public RowType getRowType() {
     return rowType;
   }
 
-  public void setRowType(String rowType) {
+  public void setRowType(RowType rowType) {
     this.rowType = rowType;
   }
 

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

@@ -0,0 +1,61 @@
+/*
+ * Accounting API
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * OpenAPI spec version: 2.0.0
+ * Contact: api@xero.com
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package com.xero.models.accounting;
+
+import java.util.Objects;
+import java.util.Arrays;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+/**
+ * Gets or Sets RowType
+ */
+public enum RowType {
+  
+  HEADER("Header"),
+  
+  SECTION("Section"),
+  
+  ROW("Row"),
+  
+  SUMMARYROW("SummaryRow");
+
+  private String value;
+
+  RowType(String value) {
+    this.value = value;
+  }
+
+  @JsonValue
+  public String getValue() {
+    return value;
+  }
+
+  @Override
+  public String toString() {
+    return String.valueOf(value);
+  }
+
+  @JsonCreator
+  public static RowType fromValue(String text) {
+    for (RowType b : RowType.values()) {
+      if (String.valueOf(b.value).equals(text)) {
+        return b;
+      }
+    }
+    throw new IllegalArgumentException("Unexpected value '" + text + "'");
+  }
+}
+