Add non-autogen typed params Event/File/EphemeralKeys (#730)

* file create params with handling of file object

* create file with typed params

* list file with typed params

update import order on files

refactor file test

* add ephemeral key create params

* add event list params

* null check for typed parameters

Author: mickjermsurawong-stripe

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

@@ -5,6 +5,7 @@
 import com.stripe.exception.StripeException;
 import com.stripe.net.ApiResource;
 import com.stripe.net.RequestOptions;
+import com.stripe.param.EphemeralKeyCreateParams;
 
 import java.util.List;
 import java.util.Map;
@@ -49,6 +50,20 @@ public class EphemeralKey extends ApiResource implements HasId {
 
   transient String rawJson;
 
+  /**
+   * Creates an ephemeral API key for a given resource.
+   *
+   * @param params request parameters
+   * @param options request options. {@code stripeVersion} is required when creating ephemeral
+   *     keys. it must have non-null {@link RequestOptions#getStripeVersionOverride()}.
+   * @return the new ephemeral key
+   */
+  public static EphemeralKey create(EphemeralKeyCreateParams params, RequestOptions options)
+      throws StripeException {
+    checkNullTypedParams(classUrl(EphemeralKey.class), params);
+    return create(params.toMap(), options);
+  }
+
   /**
    * Creates an ephemeral API key for a given resource.
    *

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

@@ -5,6 +5,7 @@
 import com.stripe.exception.StripeException;
 import com.stripe.net.ApiResource;
 import com.stripe.net.RequestOptions;
+import com.stripe.param.EventListParams;
 
 import java.util.Map;
 
@@ -104,6 +105,16 @@ public static EventCollection list(Map<String, Object> params) throws StripeExce
     return list(params, null);
   }
 
+  /**
+   * List events, going back up to 30 days. Each event data is rendered according to Stripe API
+   * version at its creation time, specified in
+   * <a href="https://stripe.com/docs/api/events/object">event object</a> {@code api_version}
+   * attribute (not according to your current Stripe API version or {@code Stripe-Version} header).
+   */
+  public static EventCollection list(EventListParams params) throws StripeException {
+    return list(params, null);
+  }
+
   /**
    * List events, going back up to 30 days. Each event data is rendered according to Stripe API
    * version at its creation time, specified in
@@ -115,6 +126,17 @@ public static EventCollection list(Map<String, Object> params, RequestOptions op
     return requestCollection(classUrl(Event.class), params, EventCollection.class, options);
   }
 
+  /**
+   * List events, going back up to 30 days. Each event data is rendered according to Stripe API
+   * version at its creation time, specified in
+   * <a href="https://stripe.com/docs/api/events/object">event object</a> {@code api_version}
+   * attribute (not according to your current Stripe API version or {@code Stripe-Version} header).
+   */
+  public static EventCollection list(EventListParams params, RequestOptions options)
+      throws StripeException {
+    return requestCollection(classUrl(Event.class), params, EventCollection.class, options);
+  }
+
   /**
    * Retrieves the details of an event. Supply the unique identifier of the event, which you might
    * have received in a webhook.

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

@@ -6,6 +6,8 @@
 import com.stripe.exception.StripeException;
 import com.stripe.net.ApiResource;
 import com.stripe.net.RequestOptions;
+import com.stripe.param.FileCreateParams;
+import com.stripe.param.FileListParams;
 
 import java.util.Map;
 
@@ -74,6 +76,26 @@ public static File create(Map<String, Object> params) throws StripeException {
     return create(params, (RequestOptions) null);
   }
 
+  /**
+   * To upload a file to Stripe, you’ll need to send a request of type {@code multipart/form-data}.
+   * The request should contain the file you would like to upload, as well as the parameters for
+   * creating a file.
+   */
+  public static File create(FileCreateParams params) throws StripeException {
+    return create(params, (RequestOptions) null);
+  }
+
+  /**
+   * To upload a file to Stripe, you’ll need to send a request of type {@code multipart/form-data}.
+   * The request should contain the file you would like to upload, as well as the parameters for
+   * creating a file.
+   */
+  public static File create(FileCreateParams params, RequestOptions options)
+      throws StripeException {
+    checkNullTypedParams(classUrl(File.class, Stripe.getUploadBase()), params);
+    return create(params.toMap(), options);
+  }
+
   /**
    * To upload a file to Stripe, you’ll need to send a request of type {@code multipart/form-data}.
    * The request should contain the file you would like to upload, as well as the parameters for
@@ -102,6 +124,23 @@ public static FileCollection list(Map<String, Object> params, RequestOptions opt
     return requestCollection(classUrl(File.class), params, FileCollection.class, options);
   }
 
+  /**
+   * Returns a list of the files that your account has access to. The files are returned sorted by
+   * creation date, with the most recently created files appearing first.
+   */
+  public static FileCollection list(FileListParams params) throws StripeException {
+    return list(params, (RequestOptions) null);
+  }
+
+  /**
+   * Returns a list of the files that your account has access to. The files are returned sorted by
+   * creation date, with the most recently created files appearing first.
+   */
+  public static FileCollection list(FileListParams params, RequestOptions options)
+      throws StripeException {
+    return requestCollection(classUrl(File.class), params, FileCollection.class, options);
+  }
+
   /**
    * Retrieves the details of an existing file object. Supply the unique file ID from a file, and
    * Stripe will return the corresponding file object.

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

@@ -166,6 +166,7 @@ public static <T> T multipartRequest(ApiResource.RequestMethod method,
   public static <T> T request(ApiResource.RequestMethod method,
                               String url, ApiRequestParams params, Class<T> clazz,
                               RequestOptions options) throws StripeException {
+    checkNullTypedParams(url, params);
     return request(method, url, params.toMap(), clazz, options);
   }
 
@@ -179,6 +180,7 @@ public static <T> T request(ApiResource.RequestMethod method,
   public static <T extends StripeCollectionInterface<?>> T requestCollection(
       String url, ApiRequestParams params, Class<T> clazz, RequestOptions options)
       throws StripeException {
+    checkNullTypedParams(url, params);
     return requestCollection(url, params.toMap(), clazz, options);
   }
 
@@ -204,6 +206,19 @@ public static <T extends StripeCollectionInterface<?>> T requestCollection(
     return collection;
   }
 
+  /**
+   * Invalidate null typed parameters.
+   * @param url     request url associated with the given parameters.
+   * @param params  typed parameters to check for null value.
+   */
+  public static void checkNullTypedParams(String url, ApiRequestParams params) {
+    if (params == null) {
+      throw new IllegalArgumentException(String.format("Found null params for %s. "
+          + "Please pass empty params using param builder via `builder().build()` instead.", url
+      ));
+    }
+  }
+
   /**
    * When setting a String ID for an ExpandableField, we need to be careful about keeping the String
    * ID and the expanded object in sync. If they specify a new String ID that is different from the

src/main/java/com/stripe/param/EphemeralKeyCreateParams.java

@@ -0,0 +1,81 @@
+package com.stripe.param;
+
+import com.google.gson.annotations.SerializedName;
+import com.stripe.net.ApiRequestParams;
+import java.util.ArrayList;
+import java.util.List;
+
+public class EphemeralKeyCreateParams extends ApiRequestParams {
+  /** The ID of the Customer you'd like to modify using the resulting ephemeral key. */
+  @SerializedName("customer")
+  String customer;
+
+  /** Specifies which fields in the response should be expanded. */
+  @SerializedName("expand")
+  List<String> expand;
+
+  /** The ID of the Issuing Card you'd like to access using the resulting ephemeral key. */
+  @SerializedName("issuing_card")
+  String issuingCard;
+
+  private EphemeralKeyCreateParams(String customer, List<String> expand, String issuingCard) {
+    this.customer = customer;
+    this.expand = expand;
+    this.issuingCard = issuingCard;
+  }
+
+  public static Builder builder() {
+    return new com.stripe.param.EphemeralKeyCreateParams.Builder();
+  }
+
+  public static class Builder {
+    private String customer;
+
+    private List<String> expand;
+
+    private String issuingCard;
+
+    /** Finalize and obtain parameter instance from this builder. */
+    public EphemeralKeyCreateParams build() {
+      return new EphemeralKeyCreateParams(this.customer, this.expand, this.issuingCard);
+    }
+
+    /** The ID of the Customer you'd like to modify using the resulting ephemeral key. */
+    public Builder setCustomer(String customer) {
+      this.customer = customer;
+      return this;
+    }
+
+    /**
+     * Add an element to `expand` list. A list is initialized for the first `add/addAll` call, and
+     * subsequent calls adds additional elements to the original list. See {@link
+     * EphemeralKeyCreateParams#expand} for the field documentation.
+     */
+    public Builder addExpand(String element) {
+      if (this.expand == null) {
+        this.expand = new ArrayList<>();
+      }
+      this.expand.add(element);
+      return this;
+    }
+
+    /**
+     * Add all elements to `expand` list. A list is initialized for the first `add/addAll` call, and
+     * subsequent calls adds additional elements to the original list. See {@link
+     * EphemeralKeyCreateParams#expand} for the field documentation.
+     */
+    public Builder addAllExpand(List<String> elements) {
+      if (this.expand == null) {
+        this.expand = new ArrayList<>();
+      }
+      this.expand.addAll(elements);
+      return this;
+    }
+
+    /** The ID of the Issuing Card you'd like to access using the resulting ephemeral key. */
+    public Builder setIssuingCard(String issuingCard) {
+      this.issuingCard = issuingCard;
+      return this;
+    }
+  }
+}