Merge changes into beta

.vscode/settings.json

@@ -18,9 +18,9 @@
   },
   "java.configuration.updateBuildConfiguration": "automatic",
   // LSP was ooming and it recommended this change
-  "java.jdt.ls.vmargs": "-XX:+UseParallelGC -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -Dsun.zip.disableMemoryMapping=true -Xmx2G -Xms100m -Xlog:disable",
+  // (jar) added -Xss8m so lombok would run without stack overflowing
+  "java.jdt.ls.vmargs": "-XX:+UseParallelGC -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -Dsun.zip.disableMemoryMapping=true -Xmx2G -Xms100m -Xlog:disable -Xss8m",
   "java.test.config": {
     "vmargs": [ "-Dstripe.disallowGlobalResponseGetterFallback=true"]
-
-  }
+  },
 }

CHANGELOG.md

@@ -49,6 +49,13 @@
   * Remove support for `from_schedule` on `Quote.subscription_data`
   * Add support for `allow_redisplay` on `terminal.ReaderCollectPaymentMethodParams.collect_config`
 
+## 27.1.1 - 2024-10-18
+* [#1901](https://github.com/stripe/stripe-java/pull/1901) update object tags for meter-related classes
+
+  - fixes a bug where the `object` property of the `MeterEvent`, `MeterEventAdjustment`, and `MeterEventSession` didn't match the server.
+* [#1898](https://github.com/stripe/stripe-java/pull/1898) Clean up examples
+* [#1894](https://github.com/stripe/stripe-java/pull/1894) Fixed example for raw request in readme file
+
 ## 27.1.0 - 2024-10-03
 * [#1890](https://github.com/stripe/stripe-java/pull/1890) Update the class for `ThinEvent` to include `livemode` and `reason`
 * [#1891](https://github.com/stripe/stripe-java/pull/1891) Removed the class `RequestSigningAuthenticator` that was added in the previous release. Request Signing is not supported yet.

build.gradle

@@ -164,3 +164,23 @@ jacoco
     // test code instrumentation for Java 18
     toolVersion = "0.8.8"
 }
+
+
+// Used when developing in vscode-java; some of our examples use
+// com.sun.net.httpserver.  This is safe to do because the JDK
+// team has committed to ensuring jdk.httpserver is exported.
+// See https://openjdk.org/jeps/403, "Exported com.sun APIs"
+import org.gradle.plugins.ide.eclipse.model.AccessRule
+
+apply plugin: 'eclipse'
+
+eclipse {
+    classpath {
+        file {
+            whenMerged {
+                def jre = entries.find { it.path.contains 'org.eclipse.jdt.launching.JRE_CONTAINER' }
+                jre.accessRules.add(new AccessRule('0', 'com/sun/net/httpserver/**'))
+            }
+        }
+    }
+}

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

@@ -198,7 +198,25 @@ private boolean apiVersionMatch() {
     // Trim the locally configured API version to not include beta headers, since the payload won't
     // have any.
     String localApiVersion = StringUtils.trimApiVersion(Stripe.stripeVersion);
-    return localApiVersion.equals(StringUtils.trimApiVersion(this.apiVersion));
+    String eventApiVersion = StringUtils.trimApiVersion(this.apiVersion);
+
+    // Preserved for testing; we have tests that hook getIntegrationApiVersion
+    // to test with other api versions.
+    if (!localApiVersion.contains(".")) {
+      return eventApiVersion.equals(localApiVersion);
+    }
+
+    // If the event api version is from before we started adding
+    // a major release identifier, there's no way its compatible with this
+    // version
+    if (!eventApiVersion.contains(".")) {
+      return false;
+    }
+
+    // versions are yyyy-MM-dd.releaseIdentifier
+    String eventReleaseTrain = eventApiVersion.split("\\.", 2)[1];
+    String currentReleaseTrain = localApiVersion.split("\\.", 2)[1];
+    return eventReleaseTrain.equals(currentReleaseTrain);
   }
 
   /**

src/test/java/com/stripe/functional/EventTest.java

@@ -68,7 +68,20 @@ public void testGetDataObjectWithSameApiVersion() throws StripeException {
   }
 
   @Test
-  public void testGetDataObjectWithDifferentApiVersion() throws StripeException {
+  public void testGetDataObjectWithNewApiVersionInSameReleaseTrain() throws StripeException {
+    String expectedReleaseTrain = Stripe.API_VERSION.split("\\.")[1];
+    final Event event = Event.retrieve(EVENT_ID);
+    // Suppose event has a different API version within the same release train as the
+    // library's pinned version
+    event.setApiVersion("2999-10-10." + expectedReleaseTrain);
+
+    Optional<StripeObject> stripeObject = event.getDataObjectDeserializer().getObject();
+
+    assertTrue(stripeObject.isPresent());
+  }
+
+  @Test
+  public void testGetDataObjectWithLegacyApiVersion() throws StripeException {
     final Event event = Event.retrieve(EVENT_ID);
     // Suppose event has different API version from the library's pinned version
     event.setApiVersion("2017-05-25");
@@ -79,4 +92,18 @@ public void testGetDataObjectWithDifferentApiVersion() throws StripeException {
     // handling schema incompatibility
     assertFalse(stripeObject.isPresent());
   }
+
+  @Test
+  public void testGetDataObjectWithReleaseTrainMismatch() throws StripeException {
+    final Event event = Event.retrieve(EVENT_ID);
+    // Suppose event has different API version and different release train from
+    // the libraries pinned version
+    event.setApiVersion("2999-10-10.the_larch");
+
+    Optional<StripeObject> stripeObject = event.getDataObjectDeserializer().getObject();
+
+    // See compatibility helper in `EventDataObjectDeserializerTest` for
+    // handling schema incompatibility
+    assertFalse(stripeObject.isPresent());
+  }
 }