[BKNDLSS-31271] Billing. Errors during subscription info decoding

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.chargify</groupId>
     <artifactId>chargify-sdk</artifactId>
-    <version>0.39</version>
+    <version>0.40</version>
     <packaging>jar</packaging>
 
     <name>Chargify SDK for Java</name>

src/main/java/com/chargify/model/AllocationPreview.java

@@ -30,7 +30,7 @@ public class AllocationPreview
   @JsonProperty( "subtotal_in_cents" )
   private Integer subtotalInCents;
   @JsonProperty( "existing_balance_in_cents" )
-  private Integer existingBalanceInCents;
+  private Long existingBalanceInCents;
   @JsonProperty( "direction" )
   private String direction;
   @JsonProperty( "proration_scheme" )

src/main/java/com/chargify/model/Charge.java

@@ -3,10 +3,19 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
 
-import java.util.Arrays;
 import java.util.Date;
 
+@NoArgsConstructor
+@Getter
+@Setter
+@ToString
+@EqualsAndHashCode
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude( JsonInclude.Include.NON_NULL )
 public class Charge
@@ -34,10 +43,10 @@ public class Charge
   private Date createdAt;
 
   @JsonProperty( "starting_balance_in_cents" )
-  private int startingBalanceInCents;
+  private long startingBalanceInCents;
 
   @JsonProperty( "ending_balance_in_cents" )
-  private int endingBalanceInCents;
+  private long endingBalanceInCents;
 
   @JsonProperty( "gateway_used" )
   private String gatewayUsed;
@@ -76,278 +85,4 @@ public class Charge
   private int taxableAmountInCents;
 
   private String[] taxations;
-
-  public Charge()
-  {
-  }
-
-  public String getId()
-  {
-    return id;
-  }
-
-  public void setId( String id )
-  {
-    this.id = id;
-  }
-
-  public String getSubscriptionId()
-  {
-    return subscriptionId;
-  }
-
-  public void setSubscriptionId( String subscriptionId )
-  {
-    this.subscriptionId = subscriptionId;
-  }
-
-  public String getType()
-  {
-    return type;
-  }
-
-  public void setType( String type )
-  {
-    this.type = type;
-  }
-
-  public String getKind()
-  {
-    return kind;
-  }
-
-  public void setKind( String kind )
-  {
-    this.kind = kind;
-  }
-
-  public String getTransactionType()
-  {
-    return transactionType;
-  }
-
-  public void setTransactionType( String transactionType )
-  {
-    this.transactionType = transactionType;
-  }
-
-  public Boolean getSuccess()
-  {
-    return success;
-  }
-
-  public void setSuccess( Boolean success )
-  {
-    this.success = success;
-  }
-
-  public int getAmountInCents()
-  {
-    return amountInCents;
-  }
-
-  public void setAmountInCents( int amountInCents )
-  {
-    this.amountInCents = amountInCents;
-  }
-
-  public String getMemo()
-  {
-    return memo;
-  }
-
-  public void setMemo( String memo )
-  {
-    this.memo = memo;
-  }
-
-  public Date getCreatedAt()
-  {
-    return createdAt;
-  }
-
-  public void setCreatedAt( Date createdAt )
-  {
-    this.createdAt = createdAt;
-  }
-
-  public int getStartingBalanceInCents()
-  {
-    return startingBalanceInCents;
-  }
-
-  public void setStartingBalanceInCents( int startingBalanceInCents )
-  {
-    this.startingBalanceInCents = startingBalanceInCents;
-  }
-
-  public int getEndingBalanceInCents()
-  {
-    return endingBalanceInCents;
-  }
-
-  public void setEndingBalanceInCents( int endingBalanceInCents )
-  {
-    this.endingBalanceInCents = endingBalanceInCents;
-  }
-
-  public String getGatewayUsed()
-  {
-    return gatewayUsed;
-  }
-
-  public void setGatewayUsed( String gatewayUsed )
-  {
-    this.gatewayUsed = gatewayUsed;
-  }
-
-  public String getGatewayTransactionId()
-  {
-    return gatewayTransactionId;
-  }
-
-  public void setGatewayTransactionId( String gatewayTransactionId )
-  {
-    this.gatewayTransactionId = gatewayTransactionId;
-  }
-
-  public String getGatewayOrderId()
-  {
-    return gatewayOrderId;
-  }
-
-  public void setGatewayOrderId( String gatewayOrderId )
-  {
-    this.gatewayOrderId = gatewayOrderId;
-  }
-
-  public String getPaymentId()
-  {
-    return paymentId;
-  }
-
-  public void setPaymentId( String paymentId )
-  {
-    this.paymentId = paymentId;
-  }
-
-  public String getProductId()
-  {
-    return productId;
-  }
-
-  public void setProductId( String productId )
-  {
-    this.productId = productId;
-  }
-
-  public String getTaxId()
-  {
-    return taxId;
-  }
-
-  public void setTaxId( String taxId )
-  {
-    this.taxId = taxId;
-  }
-
-  public String getComponentId()
-  {
-    return componentId;
-  }
-
-  public void setComponentId( String componentId )
-  {
-    this.componentId = componentId;
-  }
-
-  public String getStatementId()
-  {
-    return statementId;
-  }
-
-  public void setStatementId( String statementId )
-  {
-    this.statementId = statementId;
-  }
-
-  public String getCustomerId()
-  {
-    return customerId;
-  }
-
-  public void setCustomerId( String customerId )
-  {
-    this.customerId = customerId;
-  }
-
-  public int getOriginalAmountInCents()
-  {
-    return originalAmountInCents;
-  }
-
-  public void setOriginalAmountInCents( int originalAmountInCents )
-  {
-    this.originalAmountInCents = originalAmountInCents;
-  }
-
-  public int getDiscountAmountInCents()
-  {
-    return discountAmountInCents;
-  }
-
-  public void setDiscountAmountInCents( int discountAmountInCents )
-  {
-    this.discountAmountInCents = discountAmountInCents;
-  }
-
-  public int getTaxableAmountInCents()
-  {
-    return taxableAmountInCents;
-  }
-
-  public void setTaxableAmountInCents( int taxableAmountInCents )
-  {
-    this.taxableAmountInCents = taxableAmountInCents;
-  }
-
-  public String[] getTaxations()
-  {
-    return taxations;
-  }
-
-  public void setTaxations( String[] taxations )
-  {
-    this.taxations = taxations;
-  }
-
-  @Override
-  public String toString()
-  {
-    return "Charge{" +
-            "id='" + id + '\'' +
-            ", subscriptionId='" + subscriptionId + '\'' +
-            ", type='" + type + '\'' +
-            ", kind='" + kind + '\'' +
-            ", transactionType='" + transactionType + '\'' +
-            ", success=" + success +
-            ", amountInCents=" + amountInCents +
-            ", memo='" + memo + '\'' +
-            ", createdAt=" + createdAt +
-            ", startingBalanceInCents=" + startingBalanceInCents +
-            ", endingBalanceInCents=" + endingBalanceInCents +
-            ", gatewayUsed='" + gatewayUsed + '\'' +
-            ", gatewayTransactionId='" + gatewayTransactionId + '\'' +
-            ", gatewayOrderId='" + gatewayOrderId + '\'' +
-            ", paymentId='" + paymentId + '\'' +
-            ", productId='" + productId + '\'' +
-            ", taxId='" + taxId + '\'' +
-            ", componentId='" + componentId + '\'' +
-            ", statementId='" + statementId + '\'' +
-            ", customerId='" + customerId + '\'' +
-            ", originalAmountInCents=" + originalAmountInCents +
-            ", discountAmountInCents=" + discountAmountInCents +
-            ", taxableAmountInCents=" + taxableAmountInCents +
-            ", taxations=" + Arrays.toString( taxations ) + '}';
-  }
 }

src/main/java/com/chargify/model/Subscription.java

@@ -37,7 +37,7 @@ public class Subscription implements Serializable
   private String state;
 
   @JsonProperty( "balance_in_cents" )
-  private Integer balanceInCents;
+  private Long balanceInCents;
 
   @JsonProperty( "total_revenue_in_cents" )
   private Long totalRevenueInCents;

src/main/java/com/chargify/model/SubscriptionChargeResult.java

@@ -31,9 +31,9 @@ public class SubscriptionChargeResult implements Serializable
   @JsonProperty( "created_at" )
   private String createdAt;
   @JsonProperty( "starting_balance_in_cents" )
-  private Integer startingBalanceInCents;
+  private Long startingBalanceInCents;
   @JsonProperty( "ending_balance_in_cents" )
-  private Integer endingBalanceInCents;
+  private Long endingBalanceInCents;
   @JsonProperty( "product_id" )
   private Integer productId;
   @JsonProperty( "statement_id" )

src/main/java/com/chargify/model/SubscriptionStatement.java

@@ -58,9 +58,9 @@ public class SubscriptionStatement implements Serializable
   @JsonProperty( "customer_shipping_zip" )
   private String customerShippingZip;
   @JsonProperty( "starting_balance_in_cents" )
-  private Integer startingBalanceInCents;
+  private Long startingBalanceInCents;
   @JsonProperty( "ending_balance_in_cents" )
-  private Integer endingBalanceInCents;
+  private Long endingBalanceInCents;
   @JsonProperty( "memo" )
   private String memo;
   @JsonProperty( "subscription_id" )

src/main/java/com/chargify/model/Transaction.java

@@ -26,9 +26,9 @@ public class Transaction
   @JsonProperty( "created_at" )
   private ZonedDateTime createdAt;
   @JsonProperty( "starting_balance_in_cents" )
-  private int startingBalanceInCents;
+  private long startingBalanceInCents;
   @JsonProperty( "ending_balance_in_cents" )
-  private int endingBalanceInCents;
+  private long endingBalanceInCents;
   @JsonProperty( "gateway_used" )
   private String gatewayUsed;
   @JsonProperty( "gateway_transaction_id" )

src/test/java/com/chargify/ProductsTest.java

@@ -1,6 +1,5 @@
 package com.chargify;
 
-import com.chargify.exceptions.ChargifyException;
 import com.chargify.model.PricePointIntervalUnit;
 import com.chargify.model.product.Product;
 import com.chargify.model.product.ProductFamily;