Mbroshi/v2 int64 as string preview

src/main/java/com/stripe/model/StringInt64TypeAdapter.java

@@ -0,0 +1,31 @@
+package com.stripe.model;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonToken;
+import com.google.gson.stream.JsonWriter;
+import java.io.IOException;
+
+public class StringInt64TypeAdapter extends TypeAdapter<Long> {
+  /** Serializes Long values as JSON strings and deserializes string-encoded integers. */
+  @Override
+  public void write(JsonWriter out, Long value) throws IOException {
+    if (value == null) {
+      out.nullValue();
+      return;
+    }
+
+    out.value(value.toString());
+  }
+
+  @Override
+  public Long read(JsonReader in) throws IOException {
+    JsonToken token = in.peek();
+    if (token == JsonToken.NULL) {
+      in.nextNull();
+      return null;
+    }
+
+    return Long.valueOf(in.nextString());
+  }
+}

src/main/java/com/stripe/model/v2/billing/Cadence.java

@@ -1,8 +1,10 @@
 // File generated from our OpenAPI spec
 package com.stripe.model.v2.billing;
 
+import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.stripe.model.HasId;
+import com.stripe.model.StringInt64TypeAdapter;
 import com.stripe.model.StripeObject;
 import java.time.Instant;
 import java.util.List;
@@ -722,6 +724,7 @@ public static class Card extends StripeObject {
           public static class MandateOptions extends StripeObject {
             /** Amount to be charged for future payments. */
             @SerializedName("amount")
+            @JsonAdapter(StringInt64TypeAdapter.class)
             Long amount;
 
             /** The AmountType for the mandate. One of {@code fixed} or {@code maximum}. */

src/main/java/com/stripe/model/v2/billing/CollectionSetting.java

@@ -1,8 +1,10 @@
 // File generated from our OpenAPI spec
 package com.stripe.model.v2.billing;
 
+import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.stripe.model.HasId;
+import com.stripe.model.StringInt64TypeAdapter;
 import com.stripe.model.StripeObject;
 import java.time.Instant;
 import java.util.List;
@@ -247,6 +249,7 @@ public static class Card extends StripeObject {
       public static class MandateOptions extends StripeObject {
         /** Amount to be charged for future payments. */
         @SerializedName("amount")
+        @JsonAdapter(StringInt64TypeAdapter.class)
         Long amount;
 
         /** The AmountType for the mandate. One of {@code fixed} or {@code maximum}. */

src/main/java/com/stripe/model/v2/billing/CollectionSettingVersion.java

@@ -1,8 +1,10 @@
 // File generated from our OpenAPI spec
 package com.stripe.model.v2.billing;
 
+import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.stripe.model.HasId;
+import com.stripe.model.StringInt64TypeAdapter;
 import com.stripe.model.StripeObject;
 import java.time.Instant;
 import java.util.List;
@@ -226,6 +228,7 @@ public static class Card extends StripeObject {
       public static class MandateOptions extends StripeObject {
         /** Amount to be charged for future payments. */
         @SerializedName("amount")
+        @JsonAdapter(StringInt64TypeAdapter.class)
         Long amount;
 
         /** The AmountType for the mandate. One of {@code fixed} or {@code maximum}. */

src/main/java/com/stripe/model/v2/billing/LicenseFee.java

@@ -1,8 +1,10 @@
 // File generated from our OpenAPI spec
 package com.stripe.model.v2.billing;
 
+import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.stripe.model.HasId;
+import com.stripe.model.StringInt64TypeAdapter;
 import com.stripe.model.StripeObject;
 import java.time.Instant;
 import java.util.List;
@@ -196,6 +198,7 @@ public static class Tier extends StripeObject {
   public static class TransformQuantity extends StripeObject {
     /** Divide usage by this number. */
     @SerializedName("divide_by")
+    @JsonAdapter(StringInt64TypeAdapter.class)
     Long divideBy;
 
     /**

src/main/java/com/stripe/model/v2/billing/LicenseFeeVersion.java

@@ -1,8 +1,10 @@
 // File generated from our OpenAPI spec
 package com.stripe.model.v2.billing;
 
+import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.stripe.model.HasId;
+import com.stripe.model.StringInt64TypeAdapter;
 import com.stripe.model.StripeObject;
 import java.time.Instant;
 import java.util.List;
@@ -124,6 +126,7 @@ public static class Tier extends StripeObject {
   public static class TransformQuantity extends StripeObject {
     /** Divide usage by this number. */
     @SerializedName("divide_by")
+    @JsonAdapter(StringInt64TypeAdapter.class)
     Long divideBy;
 
     /**

src/main/java/com/stripe/model/v2/billing/RateCardRate.java

@@ -1,8 +1,10 @@
 // File generated from our OpenAPI spec
 package com.stripe.model.v2.billing;
 
+import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.stripe.model.HasId;
+import com.stripe.model.StringInt64TypeAdapter;
 import com.stripe.model.StripeObject;
 import java.time.Instant;
 import java.util.List;
@@ -167,6 +169,7 @@ public static class Tier extends StripeObject {
   public static class TransformQuantity extends StripeObject {
     /** Divide usage by this number. */
     @SerializedName("divide_by")
+    @JsonAdapter(StringInt64TypeAdapter.class)
     Long divideBy;
 
     /**

src/main/java/com/stripe/model/v2/reporting/ReportRun.java

@@ -1,8 +1,10 @@
 // File generated from our OpenAPI spec
 package com.stripe.model.v2.reporting;
 
+import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.stripe.model.HasId;
+import com.stripe.model.StringInt64TypeAdapter;
 import com.stripe.model.StripeObject;
 import java.time.Instant;
 import java.util.Map;
@@ -122,6 +124,7 @@ public static class File extends StripeObject {
 
       /** The total size of the file in bytes. */
       @SerializedName("size")
+      @JsonAdapter(StringInt64TypeAdapter.class)
       Long size;
 
       /** A pre-signed URL that allows secure, time-limited access to download the file. */

src/main/java/com/stripe/param/v2/billing/CollectionSettingCreateParams.java

@@ -1,7 +1,9 @@
 // File generated from our OpenAPI spec
 package com.stripe.param.v2.billing;
 
+import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
+import com.stripe.model.StringInt64TypeAdapter;
 import com.stripe.net.ApiRequestParams;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -1016,6 +1018,7 @@ public Builder setRequestThreeDSecure(
       public static class MandateOptions {
         /** Amount to be charged for future payments. */
         @SerializedName("amount")
+        @JsonAdapter(StringInt64TypeAdapter.class)
         Long amount;
 
         /** The AmountType for the mandate. One of {@code fixed} or {@code maximum}. */

src/main/java/com/stripe/param/v2/billing/CollectionSettingUpdateParams.java

@@ -1,7 +1,9 @@
 // File generated from our OpenAPI spec
 package com.stripe.param.v2.billing;
 
+import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
+import com.stripe.model.StringInt64TypeAdapter;
 import com.stripe.net.ApiRequestParams;
 import com.stripe.param.common.EmptyParam;
 import java.util.ArrayList;
@@ -1088,6 +1090,7 @@ public Builder setRequestThreeDSecure(
       public static class MandateOptions {
         /** Amount to be charged for future payments. */
         @SerializedName("amount")
+        @JsonAdapter(StringInt64TypeAdapter.class)
         Long amount;
 
         /** The AmountType for the mandate. One of {@code fixed} or {@code maximum}. */

src/main/java/com/stripe/param/v2/billing/LicenseFeeCreateParams.java

@@ -1,7 +1,9 @@
 // File generated from our OpenAPI spec
 package com.stripe.param.v2.billing;
 
+import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
+import com.stripe.model.StringInt64TypeAdapter;
 import com.stripe.net.ApiRequestParams;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -516,6 +518,7 @@ public enum UpToInf implements ApiRequestParams.EnumParam {
   public static class TransformQuantity {
     /** <strong>Required.</strong> Divide usage by this number. */
     @SerializedName("divide_by")
+    @JsonAdapter(StringInt64TypeAdapter.class)
     Long divideBy;
 
     /**

src/main/java/com/stripe/param/v2/billing/LicenseFeeUpdateParams.java

@@ -1,7 +1,9 @@
 // File generated from our OpenAPI spec
 package com.stripe.param.v2.billing;
 
+import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
+import com.stripe.model.StringInt64TypeAdapter;
 import com.stripe.net.ApiRequestParams;
 import com.stripe.param.common.EmptyParam;
 import java.util.ArrayList;
@@ -511,6 +513,7 @@ public enum UpToInf implements ApiRequestParams.EnumParam {
   public static class TransformQuantity {
     /** <strong>Required.</strong> Divide usage by this number. */
     @SerializedName("divide_by")
+    @JsonAdapter(StringInt64TypeAdapter.class)
     Long divideBy;
 
     /**

src/main/java/com/stripe/param/v2/billing/ratecards/RateCreateParams.java

@@ -1,7 +1,9 @@
 // File generated from our OpenAPI spec
 package com.stripe.param.v2.billing.ratecards;
 
+import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
+import com.stripe.model.StringInt64TypeAdapter;
 import com.stripe.net.ApiRequestParams;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -488,6 +490,7 @@ public enum UpToInf implements ApiRequestParams.EnumParam {
   public static class TransformQuantity {
     /** <strong>Required.</strong> Divide usage by this number. */
     @SerializedName("divide_by")
+    @JsonAdapter(StringInt64TypeAdapter.class)
     Long divideBy;
 
     /**

src/test/java/com/stripe/net/ApiRequestParamsConverterTest.java

@@ -5,7 +5,11 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
+import com.stripe.model.StringInt64TypeAdapter;
 import com.stripe.param.common.EmptyParam;
 import java.time.Instant;
 import java.util.Arrays;
@@ -122,6 +126,12 @@ private static class HasInstantParam extends ApiRequestParams {
     public Instant instantParam;
   }
 
+  private static class HasStringInt64Param extends ApiRequestParams {
+    @SerializedName("divide_by")
+    @JsonAdapter(StringInt64TypeAdapter.class)
+    public Long divideBy;
+  }
+
   @Test
   public void testHasExtraParams() {
     ModelHasExtraParams params = new ModelHasExtraParams(ParamCode.ENUM_FOO);
@@ -288,6 +298,28 @@ public void testObjectMaps() {
     assertEquals(objBar.get("hello"), "world");
   }
 
+  @Test
+  public void testToMapWithStringInt64Params() {
+    HasStringInt64Param params = new HasStringInt64Param();
+    params.divideBy = 123L;
+
+    Map<String, Object> paramMap = toMap(params);
+
+    TestCase.assertEquals(1, paramMap.size());
+    TestCase.assertTrue(paramMap.containsKey("divide_by"));
+    TestCase.assertEquals("123", paramMap.get("divide_by"));
+  }
+
+  @Test
+  public void testFromJsonWithStringInt64ResourceField() {
+    Gson gson = new GsonBuilder().create();
+
+    HasStringInt64Param resource =
+        gson.fromJson("{\"divide_by\":\"123\"}", HasStringInt64Param.class);
+
+    TestCase.assertEquals(Long.valueOf(123L), resource.divideBy);
+  }
+
   @Test
   public void testToMapWithInstantParams() {
     HasInstantParam params = new HasInstantParam();