Merge upstream and update generated code for v2204 and

Author: stripe-openapi[bot]

CODEGEN_VERSION

@@ -1 +1 @@
-e10daa4ed23a4fe87d6ea60836226446e042fdd3
+85e0466f55837da66b90fce2a7c5b7fc79b83a7c

OPENAPI_VERSION

@@ -1 +1 @@
-v2186
+v2204

src/main/java/com/stripe/ApiVersion.java

@@ -2,5 +2,5 @@
 package com.stripe;
 
 final class ApiVersion {
-  public static final String CURRENT = "2026-02-25.preview";
+  public static final String CURRENT = "2026-03-25.preview";
 }

src/main/java/com/stripe/StripeClient.java

@@ -794,6 +794,18 @@ public com.stripe.service.PrivacyService privacy() {
     return new com.stripe.service.PrivacyService(this.getResponseGetter());
   }
 
+  /**
+   * @deprecated StripeClient.productCatalog() is deprecated, use StripeClient.v1().productCatalog()
+   *     instead. All functionality under it has been copied over to
+   *     StripeClient.v1().productCatalog(). See <a
+   *     href="https://github.com/stripe/stripe-java/wiki/v1-namespace-in-StripeClient">migration
+   *     guide</a> for more on this and tips on migrating to the new v1 namespace.
+   */
+  @Deprecated
+  public com.stripe.service.ProductCatalogService productCatalog() {
+    return new com.stripe.service.ProductCatalogService(this.getResponseGetter());
+  }
+
   /**
    * @deprecated StripeClient.products() is deprecated, use StripeClient.v1().products() instead.
    *     All functionality under it has been copied over to StripeClient.v1().products(). See <a

src/main/java/com/stripe/StripeEventNotificationHandler.java

@@ -25,6 +25,16 @@
 import com.stripe.events.V2CoreAccountPersonDeletedEventNotification;
 import com.stripe.events.V2CoreAccountPersonUpdatedEventNotification;
 import com.stripe.events.V2CoreAccountUpdatedEventNotification;
+import com.stripe.events.V2CoreBatchJobBatchFailedEventNotification;
+import com.stripe.events.V2CoreBatchJobCanceledEventNotification;
+import com.stripe.events.V2CoreBatchJobCompletedEventNotification;
+import com.stripe.events.V2CoreBatchJobCreatedEventNotification;
+import com.stripe.events.V2CoreBatchJobReadyForUploadEventNotification;
+import com.stripe.events.V2CoreBatchJobTimeoutEventNotification;
+import com.stripe.events.V2CoreBatchJobUpdatedEventNotification;
+import com.stripe.events.V2CoreBatchJobUploadTimeoutEventNotification;
+import com.stripe.events.V2CoreBatchJobValidatingEventNotification;
+import com.stripe.events.V2CoreBatchJobValidationFailedEventNotification;
 import com.stripe.events.V2CoreEventDestinationPingEventNotification;
 import com.stripe.events.V2CoreHealthEventGenerationFailureResolvedEventNotification;
 import com.stripe.events.V2MoneyManagementAdjustmentCreatedEventNotification;
@@ -319,6 +329,66 @@ public StripeEventNotificationHandler onV2CoreAccountPersonUpdated(
     return this;
   }
 
+  public StripeEventNotificationHandler onV2CoreBatchJobBatchFailed(
+      Callback<V2CoreBatchJobBatchFailedEventNotification> callback) {
+    this.register("v2.core.batch_job.batch_failed", callback);
+    return this;
+  }
+
+  public StripeEventNotificationHandler onV2CoreBatchJobCanceled(
+      Callback<V2CoreBatchJobCanceledEventNotification> callback) {
+    this.register("v2.core.batch_job.canceled", callback);
+    return this;
+  }
+
+  public StripeEventNotificationHandler onV2CoreBatchJobCompleted(
+      Callback<V2CoreBatchJobCompletedEventNotification> callback) {
+    this.register("v2.core.batch_job.completed", callback);
+    return this;
+  }
+
+  public StripeEventNotificationHandler onV2CoreBatchJobCreated(
+      Callback<V2CoreBatchJobCreatedEventNotification> callback) {
+    this.register("v2.core.batch_job.created", callback);
+    return this;
+  }
+
+  public StripeEventNotificationHandler onV2CoreBatchJobReadyForUpload(
+      Callback<V2CoreBatchJobReadyForUploadEventNotification> callback) {
+    this.register("v2.core.batch_job.ready_for_upload", callback);
+    return this;
+  }
+
+  public StripeEventNotificationHandler onV2CoreBatchJobTimeout(
+      Callback<V2CoreBatchJobTimeoutEventNotification> callback) {
+    this.register("v2.core.batch_job.timeout", callback);
+    return this;
+  }
+
+  public StripeEventNotificationHandler onV2CoreBatchJobUpdated(
+      Callback<V2CoreBatchJobUpdatedEventNotification> callback) {
+    this.register("v2.core.batch_job.updated", callback);
+    return this;
+  }
+
+  public StripeEventNotificationHandler onV2CoreBatchJobUploadTimeout(
+      Callback<V2CoreBatchJobUploadTimeoutEventNotification> callback) {
+    this.register("v2.core.batch_job.upload_timeout", callback);
+    return this;
+  }
+
+  public StripeEventNotificationHandler onV2CoreBatchJobValidating(
+      Callback<V2CoreBatchJobValidatingEventNotification> callback) {
+    this.register("v2.core.batch_job.validating", callback);
+    return this;
+  }
+
+  public StripeEventNotificationHandler onV2CoreBatchJobValidationFailed(
+      Callback<V2CoreBatchJobValidationFailedEventNotification> callback) {
+    this.register("v2.core.batch_job.validation_failed", callback);
+    return this;
+  }
+
   public StripeEventNotificationHandler onV2CoreEventDestinationPing(
       Callback<V2CoreEventDestinationPingEventNotification> callback) {
     this.register("v2.core.event_destination.ping", callback);

src/main/java/com/stripe/events/V2CoreBatchJobBatchFailedEvent.java

@@ -0,0 +1,22 @@
+// File generated from our OpenAPI spec
+package com.stripe.events;
+
+import com.google.gson.annotations.SerializedName;
+import com.stripe.exception.StripeException;
+import com.stripe.model.v2.core.BatchJob;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import lombok.Getter;
+
+@Getter
+public final class V2CoreBatchJobBatchFailedEvent extends Event {
+  @SerializedName("related_object")
+
+  /** Object containing the reference to API resource relevant to the event. */
+  RelatedObject relatedObject;
+
+  /** Retrieves the related object from the API. Make an API request on every call. */
+  public BatchJob fetchRelatedObject() throws StripeException {
+    return (BatchJob) super.fetchRelatedObject(this.relatedObject);
+  }
+}

src/main/java/com/stripe/events/V2CoreBatchJobBatchFailedEventNotification.java

@@ -0,0 +1,27 @@
+// File generated from our OpenAPI spec
+package com.stripe.events;
+
+import com.google.gson.annotations.SerializedName;
+import com.stripe.exception.StripeException;
+import com.stripe.model.v2.core.BatchJob;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
+import lombok.Getter;
+
+@Getter
+public final class V2CoreBatchJobBatchFailedEventNotification extends EventNotification {
+  @SerializedName("related_object")
+
+  /** Object containing the reference to API resource relevant to the event. */
+  RelatedObject relatedObject;
+
+  /** Retrieves the related object from the API. Make an API request on every call. */
+  public BatchJob fetchRelatedObject() throws StripeException {
+    return (BatchJob) super.fetchRelatedObject(this.relatedObject);
+  }
+  /** Retrieve the corresponding full event from the Stripe API. */
+  @Override
+  public V2CoreBatchJobBatchFailedEvent fetchEvent() throws StripeException {
+    return (V2CoreBatchJobBatchFailedEvent) super.fetchEvent();
+  }
+}

src/main/java/com/stripe/events/V2CoreBatchJobCanceledEvent.java

@@ -0,0 +1,22 @@
+// File generated from our OpenAPI spec
+package com.stripe.events;
+
+import com.google.gson.annotations.SerializedName;
+import com.stripe.exception.StripeException;
+import com.stripe.model.v2.core.BatchJob;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import lombok.Getter;
+
+@Getter
+public final class V2CoreBatchJobCanceledEvent extends Event {
+  @SerializedName("related_object")
+
+  /** Object containing the reference to API resource relevant to the event. */
+  RelatedObject relatedObject;
+
+  /** Retrieves the related object from the API. Make an API request on every call. */
+  public BatchJob fetchRelatedObject() throws StripeException {
+    return (BatchJob) super.fetchRelatedObject(this.relatedObject);
+  }
+}

src/main/java/com/stripe/events/V2CoreBatchJobCanceledEventNotification.java

@@ -0,0 +1,27 @@
+// File generated from our OpenAPI spec
+package com.stripe.events;
+
+import com.google.gson.annotations.SerializedName;
+import com.stripe.exception.StripeException;
+import com.stripe.model.v2.core.BatchJob;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
+import lombok.Getter;
+
+@Getter
+public final class V2CoreBatchJobCanceledEventNotification extends EventNotification {
+  @SerializedName("related_object")
+
+  /** Object containing the reference to API resource relevant to the event. */
+  RelatedObject relatedObject;
+
+  /** Retrieves the related object from the API. Make an API request on every call. */
+  public BatchJob fetchRelatedObject() throws StripeException {
+    return (BatchJob) super.fetchRelatedObject(this.relatedObject);
+  }
+  /** Retrieve the corresponding full event from the Stripe API. */
+  @Override
+  public V2CoreBatchJobCanceledEvent fetchEvent() throws StripeException {
+    return (V2CoreBatchJobCanceledEvent) super.fetchEvent();
+  }
+}

src/main/java/com/stripe/events/V2CoreBatchJobCompletedEvent.java

@@ -0,0 +1,22 @@
+// File generated from our OpenAPI spec
+package com.stripe.events;
+
+import com.google.gson.annotations.SerializedName;
+import com.stripe.exception.StripeException;
+import com.stripe.model.v2.core.BatchJob;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import lombok.Getter;
+
+@Getter
+public final class V2CoreBatchJobCompletedEvent extends Event {
+  @SerializedName("related_object")
+
+  /** Object containing the reference to API resource relevant to the event. */
+  RelatedObject relatedObject;
+
+  /** Retrieves the related object from the API. Make an API request on every call. */
+  public BatchJob fetchRelatedObject() throws StripeException {
+    return (BatchJob) super.fetchRelatedObject(this.relatedObject);
+  }
+}