Merge pull request #2194 from stripe/latest-codegen-beta

Update generated code for beta

Author: stripe-openapi[bot]

CODEGEN_VERSION

@@ -1 +1 @@
-58595eed5a9dffbf0f297ecaf3ac45acf36c5de3
+25e6bd225852aa44d783e9fb3b9895af39479331

OPENAPI_VERSION

@@ -1 +1 @@
-v2205
+v2206

src/main/java/com/stripe/exception/RateLimitException.java

@@ -7,7 +7,7 @@
 import lombok.Getter;
 
 @Getter
-public class RateLimitException extends ApiException {
+public class RateLimitException extends StripeException {
   private static final long serialVersionUID = 2L;
 
   private final String param;

src/main/java/com/stripe/exception/StripeException.java

@@ -20,13 +20,16 @@ public abstract class StripeException extends Exception {
   ApiMode stripeErrorApiMode;
 
   public void setStripeError(StripeError err) {
+    setStripeError(err, ApiMode.V1);
+  }
+
+  public void setStripeError(StripeError err, ApiMode mode) {
     stripeError = err;
-    stripeErrorApiMode = ApiMode.V1;
+    stripeErrorApiMode = mode;
   }
 
   public void setStripeV2Error(StripeError err) {
-    stripeError = err;
-    stripeErrorApiMode = ApiMode.V2;
+    setStripeError(err, ApiMode.V2);
   }
   /**
    * Returns the error code of the response that triggered this exception. For {@link ApiException}

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

@@ -7192,9 +7192,6 @@ public static class Sofort extends StripeObject {
     @Setter
     @EqualsAndHashCode(callSuper = false)
     public static class StripeBalance extends StripeObject {
-      @SerializedName("mandate_options")
-      MandateOptions mandateOptions;
-
       /**
        * Indicates that you intend to make future payments with this PaymentIntent's payment method.
        *
@@ -7218,19 +7215,6 @@ public static class StripeBalance extends StripeObject {
        */
       @SerializedName("setup_future_usage")
       String setupFutureUsage;
-
-      /**
-       * For more details about MandateOptions, please refer to the <a
-       * href="https://docs.stripe.com/api">API Reference.</a>
-       */
-      @Getter
-      @Setter
-      @EqualsAndHashCode(callSuper = false)
-      public static class MandateOptions extends StripeObject {
-        /** The ID of the Stripe Balance Debit Agreement used for this mandate. */
-        @SerializedName("stripe_balance_debit_agreement")
-        String stripeBalanceDebitAgreement;
-      }
     }
 
     /**

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

@@ -1151,9 +1151,6 @@ public static class PaymentMethodOptions extends StripeObject {
     @SerializedName("sepa_debit")
     SepaDebit sepaDebit;
 
-    @SerializedName("stripe_balance")
-    StripeBalance stripeBalance;
-
     @SerializedName("upi")
     Upi upi;
 
@@ -1629,31 +1626,6 @@ public static class MandateOptions extends StripeObject {
       }
     }
 
-    /**
-     * For more details about StripeBalance, please refer to the <a
-     * href="https://docs.stripe.com/api">API Reference.</a>
-     */
-    @Getter
-    @Setter
-    @EqualsAndHashCode(callSuper = false)
-    public static class StripeBalance extends StripeObject {
-      @SerializedName("mandate_options")
-      MandateOptions mandateOptions;
-
-      /**
-       * For more details about MandateOptions, please refer to the <a
-       * href="https://docs.stripe.com/api">API Reference.</a>
-       */
-      @Getter
-      @Setter
-      @EqualsAndHashCode(callSuper = false)
-      public static class MandateOptions extends StripeObject {
-        /** The ID of the Stripe Balance Debit Agreement used for this mandate. */
-        @SerializedName("stripe_balance_debit_agreement")
-        String stripeBalanceDebitAgreement;
-      }
-    }
-
     /**
      * For more details about Upi, please refer to the <a href="https://docs.stripe.com/api">API
      * Reference.</a>

src/main/java/com/stripe/net/LiveStripeResponseGetter.java

@@ -331,110 +331,69 @@ private void handleError(StripeResponse response, ApiMode apiMode) throws Stripe
   }
 
   private void handleV1ApiError(StripeResponse response) throws StripeException {
-    StripeException exception = null;
-
-    StripeError error =
-        parseStripeError(response.body(), response.code(), response.requestId(), StripeError.class);
-
-    error.setLastResponse(response);
-    switch (response.code()) {
-      case 400:
-      case 404:
-        if ("idempotency_error".equals(error.getType())) {
-          exception =
-              new IdempotencyException(
-                  error.getMessage(), response.requestId(), error.getCode(), response.code());
-        } else {
-          exception =
-              new InvalidRequestException(
-                  error.getMessage(),
-                  error.getParam(),
-                  response.requestId(),
-                  error.getCode(),
-                  response.code(),
-                  null);
-        }
-        break;
-      case 401:
-        exception =
-            new AuthenticationException(
-                error.getMessage(), response.requestId(), error.getCode(), response.code());
-        break;
-      case 402:
-        exception =
-            new CardException(
-                error.getMessage(),
-                response.requestId(),
-                error.getCode(),
-                error.getParam(),
-                error.getDeclineCode(),
-                error.getCharge(),
-                response.code(),
-                null);
-        break;
-      case 403:
-        exception =
-            new PermissionException(
-                error.getMessage(), response.requestId(), error.getCode(), response.code());
-        break;
-      case 429:
-        exception =
-            new RateLimitException(
-                error.getMessage(),
-                error.getParam(),
-                response.requestId(),
-                error.getCode(),
-                response.code(),
-                null);
-        break;
-      default:
-        exception =
-            new ApiException(
-                error.getMessage(), response.requestId(), error.getCode(), response.code(), null);
-        break;
-    }
-    exception.setStripeError(error);
-
-    throw exception;
+    throwStripeException(response, ApiMode.V1);
   }
 
   private void handleV2ApiError(StripeResponse response) throws StripeException {
+    // First try to throw an exception based on the "type" field, if it exists and we
+    // recognize it. Otherwise, we will fall back to throwing an exception based on status code.
     JsonObject body =
         ApiResource.GSON.fromJson(response.body(), JsonObject.class).getAsJsonObject("error");
-
     JsonElement typeElement = body == null ? null : body.get("type");
-    JsonElement codeElement = body == null ? null : body.get("code");
     String type = typeElement == null ? "<no_type>" : typeElement.getAsString();
-    String code = codeElement == null ? "<no_code>" : codeElement.getAsString();
-
     StripeException exception =
         StripeException.parseV2Exception(type, body, response.code(), response.requestId(), this);
     if (exception != null) {
       throw exception;
     }
 
-    StripeError error;
-    try {
-      error =
-          parseStripeError(
-              response.body(), response.code(), response.requestId(), StripeError.class);
-    } catch (ApiException e) {
-      String message = "Unrecognized error type '" + type + "'";
-      JsonElement messageField = body == null ? null : body.get("message");
-      if (messageField != null && messageField.isJsonPrimitive()) {
-        message = messageField.getAsString();
-      }
-
-      throw new ApiException(message, response.requestId(), code, response.code(), null);
-    }
+    throwStripeException(response, ApiMode.V2);
+  }
 
+  private void throwStripeException(StripeResponse response, ApiMode apiMode)
+      throws StripeException {
+    StripeError error =
+        parseStripeError(response.body(), response.code(), response.requestId(), StripeError.class);
     error.setLastResponse(response);
-    exception =
-        new ApiException(error.getMessage(), response.requestId(), code, response.code(), null);
-    exception.setStripeV2Error(error);
+    StripeException exception = exceptionFromStatus(response.code(), response.requestId(), error);
+    exception.setStripeError(error, apiMode);
     throw exception;
   }
 
+  private StripeException exceptionFromStatus(int statusCode, String requestId, StripeError error) {
+    switch (statusCode) {
+      case 400:
+      case 404:
+        if ("idempotency_error".equals(error.getType())) {
+          return new IdempotencyException(
+              error.getMessage(), requestId, error.getCode(), statusCode);
+        } else {
+          return new InvalidRequestException(
+              error.getMessage(), error.getParam(), requestId, error.getCode(), statusCode, null);
+        }
+      case 401:
+        return new AuthenticationException(
+            error.getMessage(), requestId, error.getCode(), statusCode);
+      case 402:
+        return new CardException(
+            error.getMessage(),
+            requestId,
+            error.getCode(),
+            error.getParam(),
+            error.getDeclineCode(),
+            error.getCharge(),
+            statusCode,
+            null);
+      case 403:
+        return new PermissionException(error.getMessage(), requestId, error.getCode(), statusCode);
+      case 429:
+        return new RateLimitException(
+            error.getMessage(), error.getParam(), requestId, error.getCode(), statusCode, null);
+      default:
+        return new ApiException(error.getMessage(), requestId, error.getCode(), statusCode, null);
+    }
+  }
+
   private void handleOAuthError(StripeResponse response) throws StripeException {
     OAuthError error = null;
     StripeException exception = null;

src/main/java/com/stripe/param/SetupIntentConfirmParams.java

@@ -7409,13 +7409,6 @@ public static class PaymentMethodOptions {
     @SerializedName("sepa_debit")
     SepaDebit sepaDebit;
 
-    /**
-     * If this is a {@code stripe_balance} PaymentMethod, this sub-hash contains details about the
-     * Stripe Balance payment method options.
-     */
-    @SerializedName("stripe_balance")
-    StripeBalance stripeBalance;
-
     /**
      * If this is a {@code upi} SetupIntent, this sub-hash contains details about the UPI payment
      * method options.
@@ -7443,7 +7436,6 @@ private PaymentMethodOptions(
         Payto payto,
         Pix pix,
         SepaDebit sepaDebit,
-        StripeBalance stripeBalance,
         Upi upi,
         UsBankAccount usBankAccount) {
       this.acssDebit = acssDebit;
@@ -7458,7 +7450,6 @@ private PaymentMethodOptions(
       this.payto = payto;
       this.pix = pix;
       this.sepaDebit = sepaDebit;
-      this.stripeBalance = stripeBalance;
       this.upi = upi;
       this.usBankAccount = usBankAccount;
     }
@@ -7492,8 +7483,6 @@ public static class Builder {
 
       private SepaDebit sepaDebit;
 
-      private StripeBalance stripeBalance;
-
       private Upi upi;
 
       private UsBankAccount usBankAccount;
@@ -7513,7 +7502,6 @@ public SetupIntentConfirmParams.PaymentMethodOptions build() {
             this.payto,
             this.pix,
             this.sepaDebit,
-            this.stripeBalance,
             this.upi,
             this.usBankAccount);
       }
@@ -7646,16 +7634,6 @@ public Builder setSepaDebit(
         return this;
       }
 
-      /**
-       * If this is a {@code stripe_balance} PaymentMethod, this sub-hash contains details about the
-       * Stripe Balance payment method options.
-       */
-      public Builder setStripeBalance(
-          SetupIntentConfirmParams.PaymentMethodOptions.StripeBalance stripeBalance) {
-        this.stripeBalance = stripeBalance;
-        return this;
-      }
-
       /**
        * If this is a {@code upi} SetupIntent, this sub-hash contains details about the UPI payment
        * method options.
@@ -11411,64 +11389,6 @@ public Builder setReferencePrefix(EmptyParam referencePrefix) {
       }
     }
 
-    @Getter
-    @EqualsAndHashCode(callSuper = false)
-    public static class StripeBalance {
-      /**
-       * Map of extra parameters for custom features not available in this client library. The
-       * content in this map is not serialized under this field's {@code @SerializedName} value.
-       * Instead, each key/value pair is serialized as if the key is a root-level field (serialized)
-       * name in this param object. Effectively, this map is flattened to its parent instance.
-       */
-      @SerializedName(ApiRequestParams.EXTRA_PARAMS_KEY)
-      Map<String, Object> extraParams;
-
-      private StripeBalance(Map<String, Object> extraParams) {
-        this.extraParams = extraParams;
-      }
-
-      public static Builder builder() {
-        return new Builder();
-      }
-
-      public static class Builder {
-        private Map<String, Object> extraParams;
-
-        /** Finalize and obtain parameter instance from this builder. */
-        public SetupIntentConfirmParams.PaymentMethodOptions.StripeBalance build() {
-          return new SetupIntentConfirmParams.PaymentMethodOptions.StripeBalance(this.extraParams);
-        }
-
-        /**
-         * Add a key/value pair to `extraParams` map. A map is initialized for the first
-         * `put/putAll` call, and subsequent calls add additional key/value pairs to the original
-         * map. See {@link SetupIntentConfirmParams.PaymentMethodOptions.StripeBalance#extraParams}
-         * for the field documentation.
-         */
-        public Builder putExtraParam(String key, Object value) {
-          if (this.extraParams == null) {
-            this.extraParams = new HashMap<>();
-          }
-          this.extraParams.put(key, value);
-          return this;
-        }
-
-        /**
-         * Add all map key/value pairs to `extraParams` map. A map is initialized for the first
-         * `put/putAll` call, and subsequent calls add additional key/value pairs to the original
-         * map. See {@link SetupIntentConfirmParams.PaymentMethodOptions.StripeBalance#extraParams}
-         * for the field documentation.
-         */
-        public Builder putAllExtraParam(Map<String, Object> map) {
-          if (this.extraParams == null) {
-            this.extraParams = new HashMap<>();
-          }
-          this.extraParams.putAll(map);
-          return this;
-        }
-      }
-    }
-
     @Getter
     @EqualsAndHashCode(callSuper = false)
     public static class Upi {