code review feedback

Author: xavdid-stripe

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

@@ -8,6 +8,7 @@
 import com.stripe.net.Webhook.Signature;
 import java.net.PasswordAuthentication;
 import java.net.Proxy;
+import lombok.Builder;
 import lombok.Getter;
 
 /**
@@ -73,7 +74,9 @@ public StripeClient withStripeContext(StripeContext context) {
 
     StripeResponseGetter responseGetter = this.getResponseGetter();
 
-    // We can only create a new client for LiveStripeResponseGetter
+    // We can only create a new client for LiveStripeResponseGetter because it's the only class with
+    // `getOptions()`. If we add that method to the interface in a later major, we could remove this
+    // check.
     if (!(responseGetter instanceof LiveStripeResponseGetter)) {
       throw new IllegalStateException(
           "Cannot create a client with custom context for non-Live response getters");
@@ -88,20 +91,7 @@ public StripeClient withStripeContext(StripeContext context) {
               ClientStripeResponseGetterOptions existingOptions =
                   (ClientStripeResponseGetterOptions) options;
 
-              return new ClientStripeResponseGetterOptions(
-                  existingOptions.getAuthenticator(),
-                  existingOptions.getClientId(),
-                  existingOptions.getConnectTimeout(),
-                  existingOptions.getReadTimeout(),
-                  existingOptions.getMaxNetworkRetries(),
-                  existingOptions.getConnectionProxy(),
-                  existingOptions.getProxyCredential(),
-                  existingOptions.getApiBase(),
-                  existingOptions.getFilesBase(),
-                  existingOptions.getConnectBase(),
-                  existingOptions.getMeterEventsBase(),
-                  existingOptions.getStripeAccount(),
-                  contextString);
+              return existingOptions.toBuilder().stripeContext(contextString).build();
             });
 
     // Create and return a new StripeClient with the new response getter
@@ -1100,6 +1090,8 @@ public com.stripe.service.WebhookEndpointService webhookEndpoints() {
   }
 
   // The end of the section generated from our OpenAPI spec
+  @SuppressWarnings("ObjectToString")
+  @Builder(toBuilder = true)
   static class ClientStripeResponseGetterOptions extends StripeResponseGetterOptions {
     // When adding setting here keep them in sync with settings in RequestOptions and
     // in the RequestOptions.merge method

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

@@ -63,7 +63,10 @@
 import com.stripe.events.V2MoneyManagementTransactionUpdatedEventNotification;
 import com.stripe.exception.SignatureVerificationException;
 import com.stripe.model.v2.core.EventNotification;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 
 // event-notification-class-imports: The end of the section generated from our OpenAPI spec
 
@@ -109,6 +112,9 @@ public boolean isKnownEventType() {
     }
   }
 
+  // this is intentionally naiive to avoid the performance cost of interacting with `volatile`. We
+  // expect that registrations are done synchronously at startup time and handling will happen
+  // async, so thread-safe reads aren't important here.
   private boolean hasHandledEvent = false;
 
   private final String webhookSecret;
@@ -533,9 +539,9 @@ public StripeEventNotificationHandler onV2MoneyManagementTransactionUpdated(
    *
    * @return A sorted list of event type strings
    */
-  public java.util.List<String> getRegisteredEventTypes() {
-    java.util.List<String> eventTypes = new java.util.ArrayList<>(this.registeredHandlers.keySet());
-    java.util.Collections.sort(eventTypes);
+  public List<String> getRegisteredEventTypes() {
+    List<String> eventTypes = new ArrayList<>(this.registeredHandlers.keySet());
+    Collections.sort(eventTypes);
     return eventTypes;
   }
 }