killbill/killbill/#459 adding new json properties to Invoice/InvoiceItem

Author: matias-aguero-hs

src/main/java/org/killbill/billing/client/model/Invoice.java

@@ -44,6 +44,7 @@ public class Invoice extends KillBillObject {
     private String bundleKeys;
     private List<Credit> credits;
     private String status;
+    private Boolean isParentInvoice;
 
     public Invoice() {}
 
@@ -62,6 +63,7 @@ public Invoice(@JsonProperty("amount") final BigDecimal amount,
                    @JsonProperty("status") final String status,
                    @JsonProperty("credits") final List<Credit> credits,
                    @JsonProperty("items") final List<InvoiceItem> items,
+                   @JsonProperty("isParentInvoice") final Boolean isParentInvoice,
                    @JsonProperty("auditLogs") @Nullable final List<AuditLog> auditLogs) {
         super(auditLogs);
         this.amount = amount;
@@ -78,6 +80,7 @@ public Invoice(@JsonProperty("amount") final BigDecimal amount,
         this.credits = credits;
         this.items = items;
         this.status = status;
+        this.isParentInvoice = isParentInvoice;
     }
 
     public BigDecimal getAmount() {
@@ -192,6 +195,14 @@ public void setStatus(final String status) {
         this.status = status;
     }
 
+    public Boolean getIsParentInvoice() {
+        return isParentInvoice;
+    }
+
+    public void setIsParentInvoice(final Boolean isParentInvoice) {
+        this.isParentInvoice = isParentInvoice;
+    }
+
     @Override
     public String toString() {
         final StringBuilder sb = new StringBuilder("Invoice{");
@@ -209,6 +220,7 @@ public String toString() {
         sb.append(", bundleKeys='").append(bundleKeys).append('\'');
         sb.append(", credits=").append(credits);
         sb.append(", status=").append(status);
+        sb.append(", isParentInvoice=").append(isParentInvoice);
         sb.append('}');
         return sb.toString();
     }
@@ -266,6 +278,9 @@ public boolean equals(final Object o) {
         if (status != null ? !status.equals(invoice.status) : invoice.status != null) {
             return false;
         }
+        if (isParentInvoice != null ? !isParentInvoice.equals(invoice.isParentInvoice) : invoice.isParentInvoice != null) {
+            return false;
+        }
 
         return true;
     }
@@ -286,6 +301,7 @@ public int hashCode() {
         result = 31 * result + (bundleKeys != null ? bundleKeys.hashCode() : 0);
         result = 31 * result + (credits != null ? credits.hashCode() : 0);
         result = 31 * result + (status != null ? status.hashCode() : 0);
+        result = 31 * result + (isParentInvoice != null ? isParentInvoice.hashCode() : 0);
         return result;
     }
 }

src/main/java/org/killbill/billing/client/model/InvoiceItem.java

@@ -34,6 +34,7 @@ public class InvoiceItem extends KillBillObject {
     private UUID invoiceId;
     private UUID linkedInvoiceItemId;
     private UUID accountId;
+    private UUID childAccountId;
     private UUID bundleId;
     private UUID subscriptionId;
     private String planName;
@@ -53,6 +54,7 @@ public InvoiceItem(@JsonProperty("invoiceItemId") final UUID invoiceItemId,
                        @JsonProperty("invoiceId") final UUID invoiceId,
                        @JsonProperty("linkedInvoiceItemId") final UUID linkedInvoiceItemId,
                        @JsonProperty("accountId") final UUID accountId,
+                       @JsonProperty("childAccountId") final UUID childAccountId,
                        @JsonProperty("bundleId") final UUID bundleId,
                        @JsonProperty("subscriptionId") final UUID subscriptionId,
                        @JsonProperty("planName") final String planName,
@@ -70,6 +72,7 @@ public InvoiceItem(@JsonProperty("invoiceItemId") final UUID invoiceItemId,
         this.invoiceId = invoiceId;
         this.linkedInvoiceItemId = linkedInvoiceItemId;
         this.accountId = accountId;
+        this.childAccountId = childAccountId;
         this.bundleId = bundleId;
         this.subscriptionId = subscriptionId;
         this.planName = planName;
@@ -114,6 +117,14 @@ public void setAccountId(final UUID accountId) {
         this.accountId = accountId;
     }
 
+    public UUID getChildAccountId() {
+        return childAccountId;
+    }
+
+    public void setChildAccountId(final UUID childAccountId) {
+        this.childAccountId = childAccountId;
+    }
+
     public UUID getBundleId() {
         return bundleId;
     }
@@ -216,6 +227,9 @@ public boolean equals(final Object o) {
         if (accountId != null ? !accountId.equals(that.accountId) : that.accountId != null) {
             return false;
         }
+        if (childAccountId != null ? !childAccountId.equals(that.childAccountId) : that.childAccountId != null) {
+            return false;
+        }
         if (amount != null ? amount.compareTo(that.amount) != 0 : that.amount != null) {
             return false;
         }
@@ -268,6 +282,7 @@ public int hashCode() {
         result = 31 * result + (invoiceId != null ? invoiceId.hashCode() : 0);
         result = 31 * result + (linkedInvoiceItemId != null ? linkedInvoiceItemId.hashCode() : 0);
         result = 31 * result + (accountId != null ? accountId.hashCode() : 0);
+        result = 31 * result + (childAccountId != null ? childAccountId.hashCode() : 0);
         result = 31 * result + (bundleId != null ? bundleId.hashCode() : 0);
         result = 31 * result + (subscriptionId != null ? subscriptionId.hashCode() : 0);
         result = 31 * result + (planName != null ? planName.hashCode() : 0);