Fix JournalLine properties and Account Type Enum

Found the JournalLine object was based off Invoice LineItem and was missing several properties
Account Type is used for both Accounts and Journal Lines, therefore, moved AccountType into a seperate class for use by both Objects.

Author: SidneyAllen

README.md

@@ -74,7 +74,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.4</version>
+      <version>2.2.5</version>
 	</dependency>
 
 

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.4]";
+    return USER_AGENT + " " + CONSUMER_KEY + " [Xero-Java-2.2.5]";
   }
 
   @Override

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

@@ -18,6 +18,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
+import com.xero.models.accounting.AccountType;
 import com.xero.models.accounting.CurrencyCode;
 import com.xero.models.accounting.TaxType;
 import io.swagger.annotations.ApiModel;
@@ -44,84 +45,9 @@ public class Account {
   @JsonProperty("AccountID")
   private UUID accountID = null;
 
-  /**
-   * See Account Types
-   */
-  public enum TypeEnum {
-    BANK("BANK"),
-    
-    CURRENT("CURRENT"),
-    
-    CURRLIAB("CURRLIAB"),
-    
-    DEPRECIATN("DEPRECIATN"),
-    
-    DIRECTCOSTS("DIRECTCOSTS"),
-    
-    EQUITY("EQUITY"),
-    
-    EXPENSE("EXPENSE"),
-    
-    FIXED("FIXED"),
-    
-    INVENTORY("INVENTORY"),
-    
-    LIABILITY("LIABILITY"),
-    
-    NONCURRENT("NONCURRENT"),
-    
-    OTHERINCOME("OTHERINCOME"),
-    
-    OVERHEADS("OVERHEADS"),
-    
-    PREPAYMENT("PREPAYMENT"),
-    
-    REVENUE("REVENUE"),
-    
-    SALES("SALES"),
-    
-    TERMLIAB("TERMLIAB"),
-    
-    PAYGLIABILITY("PAYGLIABILITY"),
-    
-    PAYG("PAYG"),
-    
-    SUPERANNUATIONEXPENSE("SUPERANNUATIONEXPENSE"),
-    
-    SUPERANNUATIONLIABILITY("SUPERANNUATIONLIABILITY"),
-    
-    WAGESEXPENSE("WAGESEXPENSE");
-
-    private String value;
-
-    TypeEnum(String value) {
-      this.value = value;
-    }
-
-    @JsonValue
-    public String getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static TypeEnum fromValue(String text) {
-      for (TypeEnum b : TypeEnum.values()) {
-        if (String.valueOf(b.value).equals(text)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + text + "'");
-    }
-  }
-
 
   @JsonProperty("Type")
-  private TypeEnum type = null;
+  private AccountType type = null;
 
 
   @JsonProperty("BankAccountNumber")
@@ -409,21 +335,21 @@ public void setAccountID(UUID accountID) {
     this.accountID = accountID;
   }
 
-  public Account type(TypeEnum type) {
+  public Account type(AccountType type) {
     this.type = type;
     return this;
   }
 
    /**
-   * See Account Types
+   * Get type
    * @return type
   **/
-  @ApiModelProperty(value = "See Account Types")
-  public TypeEnum getType() {
+  @ApiModelProperty(value = "")
+  public AccountType getType() {
     return type;
   }
 
-  public void setType(TypeEnum type) {
+  public void setType(AccountType type) {
     this.type = type;
   }
 

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

@@ -0,0 +1,98 @@
+/*
+ * 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 io.swagger.annotations.ApiModel;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+/**
+ * See Account Types
+ */
+public enum AccountType {
+  
+  BANK("BANK"),
+  
+  CURRENT("CURRENT"),
+  
+  CURRLIAB("CURRLIAB"),
+  
+  DEPRECIATN("DEPRECIATN"),
+  
+  DIRECTCOSTS("DIRECTCOSTS"),
+  
+  EQUITY("EQUITY"),
+  
+  EXPENSE("EXPENSE"),
+  
+  FIXED("FIXED"),
+  
+  INVENTORY("INVENTORY"),
+  
+  LIABILITY("LIABILITY"),
+  
+  NONCURRENT("NONCURRENT"),
+  
+  OTHERINCOME("OTHERINCOME"),
+  
+  OVERHEADS("OVERHEADS"),
+  
+  PREPAYMENT("PREPAYMENT"),
+  
+  REVENUE("REVENUE"),
+  
+  SALES("SALES"),
+  
+  TERMLIAB("TERMLIAB"),
+  
+  PAYGLIABILITY("PAYGLIABILITY"),
+  
+  PAYG("PAYG"),
+  
+  SUPERANNUATIONEXPENSE("SUPERANNUATIONEXPENSE"),
+  
+  SUPERANNUATIONLIABILITY("SUPERANNUATIONLIABILITY"),
+  
+  WAGESEXPENSE("WAGESEXPENSE");
+
+  private String value;
+
+  AccountType(String value) {
+    this.value = value;
+  }
+
+  @JsonValue
+  public String getValue() {
+    return value;
+  }
+
+  @Override
+  public String toString() {
+    return String.valueOf(value);
+  }
+
+  @JsonCreator
+  public static AccountType fromValue(String text) {
+    for (AccountType b : AccountType.values()) {
+      if (String.valueOf(b.value).equals(text)) {
+        return b;
+      }
+    }
+    throw new IllegalArgumentException("Unexpected value '" + text + "'");
+  }
+}
+