make constuctors private

Author: xavdid

src/main/java/com/stripe/model/v2/core/Event.java

@@ -99,7 +99,7 @@ protected StripeObject fetchRelatedObject(RelatedObject relatedObject) throws St
     }
 
     RequestOptions.RequestOptionsBuilder optsBuilder = new RequestOptions.RequestOptionsBuilder();
-    // optsBuilder.setStripeRequestTrigger("event=" + id); // TODO https://go/j/DEVSDK-3018
+    optsBuilder.setStripeRequestTrigger("event=" + id);
 
     if (context != null) {
       optsBuilder.setStripeAccount(context);

src/main/java/com/stripe/model/v2/core/EventNotification.java

@@ -15,7 +15,6 @@
 import com.stripe.net.RawRequestOptions;
 import com.stripe.net.StripeResponse;
 import java.time.Instant;
-import java.util.Collections;
 import lombok.AccessLevel;
 import lombok.Getter;
 
@@ -108,9 +107,7 @@ public static EventNotification fromJson(String payload, StripeClient client) {
 
   private RawRequestOptions getRequestOptions() {
     RawRequestOptions.RawRequestOptionsBuilder builder =
-        new RawRequestOptions.RawRequestOptionsBuilder()
-            .setAdditionalHeaders(
-                Collections.singletonMap("Stripe-Request-Trigger", "event=" + id));
+        RawRequestOptions.builder().setStripeRequestTrigger("event=" + id);
     if (context != null) {
       builder.setStripeContext(context.toString());
     }

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

@@ -8,37 +8,9 @@
 public class RawRequestOptions extends RequestOptions {
   private Map<String, String> additionalHeaders;
 
-  // TODO: make this private
-  // see: https://go/j/DEVSDK-3018
-  public RawRequestOptions(
-      Authenticator authenticator,
-      String clientId,
-      String idempotencyKey,
-      String stripeContext,
-      String stripeAccount,
-      String stripeVersionOverride,
-      String baseUrl,
-      Integer connectTimeout,
-      Integer readTimeout,
-      Integer maxNetworkRetries,
-      Proxy connectionProxy,
-      PasswordAuthentication proxyCredential,
-      Map<String, String> additionalHeaders) {
-    super(
-        authenticator,
-        clientId,
-        idempotencyKey,
-        stripeContext,
-        null,
-        stripeAccount,
-        stripeVersionOverride,
-        baseUrl,
-        connectTimeout,
-        readTimeout,
-        maxNetworkRetries,
-        connectionProxy,
-        proxyCredential);
-    this.additionalHeaders = additionalHeaders;
+  private RawRequestOptions(RawRequestOptionsBuilder builder) {
+    super(builder);
+    this.additionalHeaders = builder.additionalHeaders;
   }
 
   public Map<String, String> getAdditionalHeaders() {
@@ -91,6 +63,12 @@ public RawRequestOptionsBuilder setStripeContext(StripeContext stripeContext) {
       return this;
     }
 
+    @Override
+    public RawRequestOptionsBuilder setStripeRequestTrigger(String stripeRequestTrigger) {
+      super.setStripeRequestTrigger(stripeRequestTrigger);
+      return this;
+    }
+
     @Override
     public RawRequestOptionsBuilder setStripeAccount(String stripeAccount) {
       super.setStripeAccount(stripeAccount);
@@ -135,20 +113,7 @@ public RawRequestOptionsBuilder setProxyCredential(PasswordAuthentication proxyC
 
     @Override
     public RawRequestOptions build() {
-      return new RawRequestOptions(
-          authenticator,
-          normalizeClientId(this.clientId),
-          normalizeIdempotencyKey(this.idempotencyKey),
-          normalizeStripeContext(this.stripeContext),
-          normalizeStripeAccount(this.stripeAccount),
-          normalizeStripeVersion(this.stripeVersionOverride),
-          normalizeBaseUrl(this.baseUrl),
-          connectTimeout,
-          readTimeout,
-          maxNetworkRetries,
-          connectionProxy,
-          proxyCredential,
-          additionalHeaders);
+      return new RawRequestOptions(this);
     }
   }
 }

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

@@ -35,7 +35,7 @@ public static RequestOptions getDefault() {
     return new RequestOptionsBuilder().build();
   }
 
-  protected RequestOptions(
+  private RequestOptions(
       Authenticator authenticator,
       String clientId,
       String idempotencyKey,
@@ -64,6 +64,23 @@ protected RequestOptions(
     this.proxyCredential = proxyCredential;
   }
 
+  RequestOptions(RequestOptionsBuilder builder) {
+    this(
+        builder.authenticator,
+        normalizeClientId(builder.clientId),
+        normalizeIdempotencyKey(builder.idempotencyKey),
+        builder.stripeContext,
+        builder.stripeRequestTrigger,
+        normalizeStripeAccount(builder.stripeAccount),
+        normalizeStripeVersion(builder.stripeVersionOverride),
+        normalizeBaseUrl(builder.baseUrl),
+        builder.connectTimeout,
+        builder.readTimeout,
+        builder.maxNetworkRetries,
+        builder.connectionProxy,
+        builder.proxyCredential);
+  }
+
   public Authenticator getAuthenticator() {
     return this.authenticator;
   }
@@ -383,20 +400,7 @@ public RequestOptionsBuilder setBaseUrl(final String baseUrl) {
 
     /** Constructs a {@link RequestOptions} with the specified values. */
     public RequestOptions build() {
-      return new RequestOptions(
-          this.authenticator,
-          normalizeClientId(this.clientId),
-          normalizeIdempotencyKey(this.idempotencyKey),
-          stripeContext,
-          stripeRequestTrigger,
-          normalizeStripeAccount(this.stripeAccount),
-          normalizeStripeVersion(this.stripeVersionOverride),
-          normalizeBaseUrl(this.baseUrl),
-          connectTimeout,
-          readTimeout,
-          maxNetworkRetries,
-          connectionProxy,
-          proxyCredential);
+      return new RequestOptions(this);
     }
   }
 
@@ -513,34 +517,46 @@ static RequestOptions merge(StripeResponseGetterOptions clientOptions, RequestOp
     } else {
       stripeContext = clientOptions.getStripeContext();
     }
-    return new RequestOptions(
-        options.getAuthenticator() != null
-            ? options.getAuthenticator()
-            : clientOptions.getAuthenticator(),
-        options.getClientId() != null ? options.getClientId() : clientOptions.getClientId(),
-        options.getIdempotencyKey(),
-        stripeContext,
-        options.getStripeRequestTrigger(),
-        options.getStripeAccount() != null
-            ? options.getStripeAccount()
-            : clientOptions.getStripeAccount(),
-        RequestOptions.unsafeGetStripeVersionOverride(options),
-        options.getBaseUrl(),
-        options.getConnectTimeout() != null
-            ? options.getConnectTimeout()
-            : clientOptions.getConnectTimeout(),
-        options.getReadTimeout() != null
-            ? options.getReadTimeout()
-            : clientOptions.getReadTimeout(),
-        options.getMaxNetworkRetries() != null
-            ? options.getMaxNetworkRetries()
-            : clientOptions.getMaxNetworkRetries(),
-        options.getConnectionProxy() != null
-            ? options.getConnectionProxy()
-            : clientOptions.getConnectionProxy(),
-        options.getProxyCredential() != null
-            ? options.getProxyCredential()
-            : clientOptions.getProxyCredential());
+
+    return RequestOptionsBuilder.unsafeSetStripeVersionOverride(
+            new RequestOptionsBuilder()
+                .setAuthenticator(
+                    options.getAuthenticator() != null
+                        ? options.getAuthenticator()
+                        : clientOptions.getAuthenticator())
+                .setClientId(
+                    options.getClientId() != null
+                        ? options.getClientId()
+                        : clientOptions.getClientId())
+                .setIdempotencyKey(options.getIdempotencyKey())
+                .setStripeContext(stripeContext)
+                .setStripeRequestTrigger(options.getStripeRequestTrigger())
+                .setStripeAccount(
+                    options.getStripeAccount() != null
+                        ? options.getStripeAccount()
+                        : clientOptions.getStripeAccount())
+                .setConnectTimeout(
+                    options.getConnectTimeout() != null
+                        ? options.getConnectTimeout()
+                        : clientOptions.getConnectTimeout())
+                .setReadTimeout(
+                    options.getReadTimeout() != null
+                        ? options.getReadTimeout()
+                        : clientOptions.getReadTimeout())
+                .setMaxNetworkRetries(
+                    options.getMaxNetworkRetries() != null
+                        ? options.getMaxNetworkRetries()
+                        : clientOptions.getMaxNetworkRetries())
+                .setConnectionProxy(
+                    options.getConnectionProxy() != null
+                        ? options.getConnectionProxy()
+                        : clientOptions.getConnectionProxy())
+                .setProxyCredential(
+                    options.getProxyCredential() != null
+                        ? options.getProxyCredential()
+                        : clientOptions.getProxyCredential()),
+            RequestOptions.unsafeGetStripeVersionOverride(options))
+        .build();
   }
 
   public static class InvalidRequestOptionsException extends RuntimeException {

src/test/java/com/stripe/model/v2/EventTests.java

@@ -115,7 +115,6 @@ public void parsesV2EventAndDeserializesEventData() throws StripeException {
     assertEquals("foo", data.getDeveloperMessageSummary());
   }
 
-  // currently intentionally broken while we wait for the major & https://go/j/DEVSDK-3018
   @Test
   public void retrieveObjectFetchesAndDeserializesObject() throws StripeException, IOException {
     V1BillingMeterErrorReportTriggeredEvent event =