Merge branch 'master' into DEVSDK-3012

xavdid · xavdid · commit 82dee14532c0 · 2026-03-17T17:54:22.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 31.4.1 - 2026-03-06
+* [#2168](https://github.com/stripe/stripe-java/pull/2168) Support serializing Stripe objects with ApiResource.GSON
+  * `ApiResource.GSON` now supports serializing Stripe objects back into compatible JSON
+* [#2165](https://github.com/stripe/stripe-java/pull/2165) Add AI Agent information to UserAgent
+
 ## 31.4.0 - 2026-02-25
 This release changes the pinned API version to `2026-02-25.clover`.
 
diff --git a/README.md b/README.md
@@ -1,9 +1,12 @@
 # Stripe Java client library
 
-[![Maven Central](https://img.shields.io/badge/maven--central-v31.4.0-blue)](https://mvnrepository.com/artifact/com.stripe/stripe-java)
+[![Maven Central](https://img.shields.io/badge/maven--central-v31.4.1-blue)](https://mvnrepository.com/artifact/com.stripe/stripe-java)
 [![JavaDoc](http://img.shields.io/badge/javadoc-reference-blue.svg)](https://stripe.dev/stripe-java)
 [![Build Status](https://github.com/stripe/stripe-java/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/stripe/stripe-java/actions?query=branch%3Amaster)
 
+> [!TIP]
+> Want to chat live with Stripe engineers? Join us on our [Discord server](https://stripe.com/go/discord/java).
+
 The official [Stripe][stripe] Java client library.
 
 ## Installation
@@ -23,7 +26,7 @@ We support LTS versions of the JDK. Currently, that's Java versions:
 Add this dependency to your project's build file:
 
 ```groovy
-implementation "com.stripe:stripe-java:31.4.0"
+implementation "com.stripe:stripe-java:31.4.1"
 ```
 
 ### Maven users
@@ -34,7 +37,7 @@ Add this dependency to your project's POM:
 <dependency>
   <groupId>com.stripe</groupId>
   <artifactId>stripe-java</artifactId>
-  <version>31.4.0</version>
+  <version>31.4.1</version>
 </dependency>
 ```
 
@@ -43,8 +46,8 @@ Add this dependency to your project's POM:
 If you are not using Gradle or Maven, you will need to manually install the following JARs:
 
 1. The Stripe JAR:
-   - Download the latest release version from [Maven Central](https://repo1.maven.org/maven2/com/stripe/stripe-java/31.4.0/stripe-java-31.4.0.jar)
-   - Current release version: 31.4.0
+   - Download the latest release version from [Maven Central](https://repo1.maven.org/maven2/com/stripe/stripe-java/31.4.1/stripe-java-31.4.1.jar)
+   - Current release version: 31.4.1
 
 2. Google Gson:
    - The Stripe JAR builds and tests with Gson version 2.10.1
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-31.4.0
+31.4.1
diff --git a/build.gradle b/build.gradle
@@ -100,7 +100,7 @@ jar {
                    "Implementation-Vendor": VENDOR_NAME,
                    "Bundle-SymbolicName": POM_ARTIFACT_ID,
                    "Export-Package": "com.stripe.*",
-                   "Automatic-Module-Name": "stripe.java")
+                   "Automatic-Module-Name": "com.stripe")
 
         archiveVersion = VERSION_NAME
     }
diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 GROUP=com.stripe
-VERSION_NAME=31.4.0
+VERSION_NAME=31.4.1
 
 POM_URL=https://github.com/stripe/stripe-java
 POM_SCM_URL=git@github.com:stripe/stripe-java.git
diff --git a/src/main/java/com/stripe/Stripe.java b/src/main/java/com/stripe/Stripe.java
@@ -14,7 +14,7 @@ public abstract class Stripe {
   public static final String LIVE_API_BASE = "https://api.stripe.com";
   public static final String UPLOAD_API_BASE = "https://files.stripe.com";
   public static final String METER_EVENTS_API_BASE = "https://meter-events.stripe.com";
-  public static final String VERSION = "31.4.0";
+  public static final String VERSION = "31.4.1";
 
   public static volatile String apiKey;
   public static volatile String clientId;
diff --git a/src/main/java/com/stripe/model/BalanceTransactionSourceTypeAdapterFactory.java b/src/main/java/com/stripe/model/BalanceTransactionSourceTypeAdapterFactory.java
@@ -25,9 +25,6 @@ public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> type) {
     }
     final String discriminator = "object";
     final TypeAdapter<JsonElement> jsonElementAdapter = gson.getAdapter(JsonElement.class);
-    final TypeAdapter<com.stripe.model.BalanceTransactionSource> balanceTransactionSourceAdapter =
-        gson.getDelegateAdapter(
-            this, TypeToken.get(com.stripe.model.BalanceTransactionSource.class));
     final TypeAdapter<com.stripe.model.ApplicationFee> applicationFeeAdapter =
         gson.getDelegateAdapter(this, TypeToken.get(com.stripe.model.ApplicationFee.class));
     final TypeAdapter<com.stripe.model.Charge> chargeAdapter =
@@ -68,7 +65,13 @@ public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> type) {
         new TypeAdapter<BalanceTransactionSource>() {
           @Override
           public void write(JsonWriter out, BalanceTransactionSource value) throws IOException {
-            balanceTransactionSourceAdapter.write(out, value);
+            @SuppressWarnings("unchecked")
+            TypeAdapter<BalanceTransactionSource> adapter =
+                (TypeAdapter<BalanceTransactionSource>)
+                    gson.getDelegateAdapter(
+                        BalanceTransactionSourceTypeAdapterFactory.this,
+                        TypeToken.get(value.getClass()));
+            adapter.write(out, value);
           }
 
           @Override
diff --git a/src/main/java/com/stripe/model/ExternalAccountTypeAdapterFactory.java b/src/main/java/com/stripe/model/ExternalAccountTypeAdapterFactory.java
@@ -28,8 +28,6 @@ public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> type) {
     }
     final String discriminator = "object";
     final TypeAdapter<JsonElement> jsonElementAdapter = gson.getAdapter(JsonElement.class);
-    final TypeAdapter<com.stripe.model.ExternalAccount> externalAccountAdapter =
-        gson.getDelegateAdapter(this, TypeToken.get(com.stripe.model.ExternalAccount.class));
     final TypeAdapter<com.stripe.model.BankAccount> bankAccountAdapter =
         gson.getDelegateAdapter(this, TypeToken.get(com.stripe.model.BankAccount.class));
     final TypeAdapter<com.stripe.model.Card> cardAdapter =
@@ -39,7 +37,12 @@ public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> type) {
         new TypeAdapter<ExternalAccount>() {
           @Override
           public void write(JsonWriter out, ExternalAccount value) throws IOException {
-            externalAccountAdapter.write(out, value);
+            @SuppressWarnings("unchecked")
+            TypeAdapter<ExternalAccount> adapter =
+                (TypeAdapter<ExternalAccount>)
+                    gson.getDelegateAdapter(
+                        ExternalAccountTypeAdapterFactory.this, TypeToken.get(value.getClass()));
+            adapter.write(out, value);
           }
 
           @Override
diff --git a/src/main/java/com/stripe/model/PaymentSourceTypeAdapterFactory.java b/src/main/java/com/stripe/model/PaymentSourceTypeAdapterFactory.java
@@ -25,8 +25,6 @@ public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> type) {
     }
     final String discriminator = "object";
     final TypeAdapter<JsonElement> jsonElementAdapter = gson.getAdapter(JsonElement.class);
-    final TypeAdapter<com.stripe.model.PaymentSource> paymentSourceAdapter =
-        gson.getDelegateAdapter(this, TypeToken.get(com.stripe.model.PaymentSource.class));
     final TypeAdapter<com.stripe.model.Account> accountAdapter =
         gson.getDelegateAdapter(this, TypeToken.get(com.stripe.model.Account.class));
     final TypeAdapter<com.stripe.model.BankAccount> bankAccountAdapter =
@@ -40,7 +38,12 @@ public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> type) {
         new TypeAdapter<PaymentSource>() {
           @Override
           public void write(JsonWriter out, PaymentSource value) throws IOException {
-            paymentSourceAdapter.write(out, value);
+            @SuppressWarnings("unchecked")
+            TypeAdapter<PaymentSource> adapter =
+                (TypeAdapter<PaymentSource>)
+                    gson.getDelegateAdapter(
+                        PaymentSourceTypeAdapterFactory.this, TypeToken.get(value.getClass()));
+            adapter.write(out, value);
           }
 
           @Override
diff --git a/src/main/java/com/stripe/model/StringInt64TypeAdapter.java b/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());
+  }
+}
diff --git a/src/main/java/com/stripe/model/StripeRawJsonObjectSerializer.java b/src/main/java/com/stripe/model/StripeRawJsonObjectSerializer.java
@@ -0,0 +1,18 @@
+package com.stripe.model;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonNull;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
+import java.lang.reflect.Type;
+
+public class StripeRawJsonObjectSerializer implements JsonSerializer<StripeRawJsonObject> {
+  @Override
+  public JsonElement serialize(
+      StripeRawJsonObject src, Type typeOfSrc, JsonSerializationContext context) {
+    if (src.json != null) {
+      return src.json;
+    }
+    return JsonNull.INSTANCE;
+  }
+}
diff --git a/src/main/java/com/stripe/net/ApiResource.java b/src/main/java/com/stripe/net/ApiResource.java
@@ -57,9 +57,11 @@ private static Gson createGson(boolean shouldSetResponseGetter) {
             .registerTypeAdapter(Event.Request.class, new EventRequestDeserializer())
             .registerTypeAdapter(StripeContext.class, new StripeContextDeserializer())
             .registerTypeAdapter(ExpandableField.class, new ExpandableFieldDeserializer())
+            .registerTypeAdapter(ExpandableField.class, new ExpandableFieldSerializer())
             .registerTypeAdapter(Instant.class, new InstantDeserializer())
             .registerTypeAdapterFactory(new EventTypeAdapterFactory())
             .registerTypeAdapter(StripeRawJsonObject.class, new StripeRawJsonObjectDeserializer())
+            .registerTypeAdapter(StripeRawJsonObject.class, new StripeRawJsonObjectSerializer())
             .registerTypeAdapterFactory(new StripeCollectionItemTypeSettingFactory())
             .addReflectionAccessFilter(
                 new ReflectionAccessFilter() {
diff --git a/src/main/java/com/stripe/net/HttpClient.java b/src/main/java/com/stripe/net/HttpClient.java
@@ -144,13 +144,18 @@ static String detectAIAgent() {
 
   static String detectAIAgent(Function<String, String> getEnv) {
     String[][] agents = {
+      // The beginning of the section generated from our OpenAPI spec
       {"ANTIGRAVITY_CLI_ALIAS", "antigravity"},
       {"CLAUDECODE", "claude_code"},
       {"CLINE_ACTIVE", "cline"},
       {"CODEX_SANDBOX", "codex_cli"},
+      {"CODEX_THREAD_ID", "codex_cli"},
+      {"CODEX_SANDBOX_NETWORK_DISABLED", "codex_cli"},
+      {"CODEX_CI", "codex_cli"},
       {"CURSOR_AGENT", "cursor"},
       {"GEMINI_CLI", "gemini_cli"},
       {"OPENCODE", "open_code"},
+      // The end of the section generated from our OpenAPI spec
     };
     for (String[] agent : agents) {
       String val = getEnv.apply(agent[0]);
@@ -196,23 +201,23 @@ protected static String buildXStripeClientUserAgentString() {
   }
 
   static String buildXStripeClientUserAgentString(String aiAgent) {
-    String[] propertyNames = {
-      "os.name",
-      "os.version",
-      "os.arch",
-      "java.version",
-      "java.vendor",
-      "java.vm.version",
-      "java.vm.vendor"
-    };
+    String[] propertyNames = {"java.version", "java.vendor", "java.vm.version", "java.vm.vendor"};
 
     Map<String, String> propertyMap = new HashMap<>();
     for (String propertyName : propertyNames) {
       propertyMap.put(propertyName, System.getProperty(propertyName));
     }
     propertyMap.put("bindings.version", Stripe.VERSION);
     propertyMap.put("lang", "Java");
-    propertyMap.put("publisher", "Stripe");
+    if (Stripe.enableTelemetry) {
+      propertyMap.put(
+          "platform",
+          System.getProperty("os.name")
+              + " "
+              + System.getProperty("os.version")
+              + " "
+              + System.getProperty("os.arch"));
+    }
     if (Stripe.getAppInfo() != null) {
       propertyMap.put("application", ApiResource.INTERNAL_GSON.toJson(Stripe.getAppInfo()));
     }
diff --git a/src/test/java/com/stripe/model/GsonRoundTripTest.java b/src/test/java/com/stripe/model/GsonRoundTripTest.java
diff --git a/src/test/java/com/stripe/model/InvoiceTest.java b/src/test/java/com/stripe/model/InvoiceTest.java
diff --git a/src/test/java/com/stripe/net/ApiRequestParamsConverterTest.java b/src/test/java/com/stripe/net/ApiRequestParamsConverterTest.java
diff --git a/src/test/java/com/stripe/net/HttpClientTest.java b/src/test/java/com/stripe/net/HttpClientTest.java

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ jar {`
`100`	`100`	`"Implementation-Vendor": VENDOR_NAME,`
`101`	`101`	`"Bundle-SymbolicName": POM_ARTIFACT_ID,`
`102`	`102`	`"Export-Package": "com.stripe.*",`
`103`		`- "Automatic-Module-Name": "stripe.java")`
	`103`	`+ "Automatic-Module-Name": "com.stripe")`
`104`	`104`
`105`	`105`	`archiveVersion = VERSION_NAME`
`106`	`106`	`}`