Merge pull request #183 from XeroAPI/sid-development

bump version of OAS to 2.0.0

Author: SidneyAllen

pom.xml

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

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

src/main/java/com/xero/api/client/AssetApi.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.3";
+    private String version = "3.3.0";
 
     public BankFeedsApi() {
         this(new ApiClient());

src/main/java/com/xero/api/client/BankFeedsApi.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.3";
+    private String version = "3.3.0";
 
     public IdentityApi() {
         this(new ApiClient());

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

@@ -119,10 +119,45 @@ public static TypeEnum fromValue(String value) {
 
   @JsonProperty("Type")
   private TypeEnum type;
+  /**
+   * AUTHORISED or DELETED (read-only). New batch payments will have a status of AUTHORISED. It is not possible to delete batch payments via the API.
+   */
+  public enum StatusEnum {
+    AUTHORISED("AUTHORISED"),
+    
+    DELETED("DELETED");
+
+    private String value;
+
+    StatusEnum(String value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static StatusEnum fromValue(String value) {
+      for (StatusEnum b : StatusEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
 
 
   @JsonProperty("Status")
-  private String status;
+  private StatusEnum status;
 
 
   @JsonProperty("TotalAmount")
@@ -346,7 +381,7 @@ public TypeEnum getType() {
    * @return status
   **/
   @ApiModelProperty(value = "AUTHORISED or DELETED (read-only). New batch payments will have a status of AUTHORISED. It is not possible to delete batch payments via the API.")
-  public String getStatus() {
+  public StatusEnum getStatus() {
     return status;
   }
 

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

@@ -82,7 +82,7 @@ public class Item {
 
 
   @JsonProperty("QuantityOnHand")
-  private Double quantityOnHand;
+  private Float quantityOnHand;
 
   @JsonDeserialize(using = com.xero.api.CustomOffsetDateTimeDeserializer.class)
   @JsonProperty("UpdatedDateUTC")
@@ -297,7 +297,7 @@ public void setTotalCostPool(Double totalCostPool) {
     this.totalCostPool = totalCostPool;
   }
 
-  public Item quantityOnHand(Double quantityOnHand) {
+  public Item quantityOnHand(Float quantityOnHand) {
     this.quantityOnHand = quantityOnHand;
     return this;
   }
@@ -307,11 +307,11 @@ public Item quantityOnHand(Double quantityOnHand) {
    * @return quantityOnHand
   **/
   @ApiModelProperty(value = "The quantity of the item on hand")
-  public Double getQuantityOnHand() {
+  public Float getQuantityOnHand() {
     return quantityOnHand;
   }
 
-  public void setQuantityOnHand(Double quantityOnHand) {
+  public void setQuantityOnHand(Float quantityOnHand) {
     this.quantityOnHand = quantityOnHand;
   }
 

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

@@ -44,11 +44,11 @@ public class LineItem {
 
 
   @JsonProperty("Quantity")
-  private Double quantity;
+  private Float quantity;
 
 
   @JsonProperty("UnitAmount")
-  private Double unitAmount;
+  private Float unitAmount;
 
 
   @JsonProperty("ItemCode")
@@ -121,7 +121,7 @@ public void setDescription(String description) {
     this.description = description;
   }
 
-  public LineItem quantity(Double quantity) {
+  public LineItem quantity(Float quantity) {
     this.quantity = quantity;
     return this;
   }
@@ -131,15 +131,15 @@ public LineItem quantity(Double quantity) {
    * @return quantity
   **/
   @ApiModelProperty(value = "LineItem Quantity")
-  public Double getQuantity() {
+  public Float getQuantity() {
     return quantity;
   }
 
-  public void setQuantity(Double quantity) {
+  public void setQuantity(Float quantity) {
     this.quantity = quantity;
   }
 
-  public LineItem unitAmount(Double unitAmount) {
+  public LineItem unitAmount(Float unitAmount) {
     this.unitAmount = unitAmount;
     return this;
   }
@@ -149,11 +149,11 @@ public LineItem unitAmount(Double unitAmount) {
    * @return unitAmount
   **/
   @ApiModelProperty(value = "LineItem Unit Amount")
-  public Double getUnitAmount() {
+  public Float getUnitAmount() {
     return unitAmount;
   }
 
-  public void setUnitAmount(Double unitAmount) {
+  public void setUnitAmount(Float unitAmount) {
     this.unitAmount = unitAmount;
   }
 

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

@@ -64,7 +64,9 @@ public enum StatusEnum {
 
     DELETED("DELETED"),
 
-    VOIDED("VOIDED");
+    VOIDED("VOIDED"),
+    
+    ARCHIVED("ARCHIVED");
 
     private String value;
 

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

@@ -288,7 +288,9 @@ public enum SalesTaxPeriodEnum {
 
     QUARTERLY("QUARTERLY"),
 
-    YEARLY("YEARLY");
+    YEARLY("YEARLY"),
+    
+    NONE("NONE");
 
     private String value;