Fix type bounds on request (#2037)

* Fix type bounds on request

* Fix formatting issues

Author: mbroshi-stripe

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

@@ -1,7 +1,7 @@
 package com.stripe.net;
 
 import com.stripe.exception.StripeException;
-import com.stripe.model.StripeObjectInterface;
+import com.stripe.model.StripeObject;
 import java.io.InputStream;
 import java.lang.reflect.Type;
 import lombok.AccessLevel;
@@ -17,7 +17,7 @@ protected ApiService(StripeResponseGetter responseGetter) {
   }
 
   @SuppressWarnings("TypeParameterUnusedInFormals")
-  protected <T extends StripeObjectInterface> T request(ApiRequest request, Type typeToken)
+  protected <T extends StripeObject> T request(ApiRequest request, Type typeToken)
       throws StripeException {
     return this.getResponseGetter().request(request.addUsage("stripe_client"), typeToken);
   }

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

@@ -118,7 +118,7 @@ private StripeRequest toRawStripeRequest(RawApiRequest apiRequest, RequestOption
 
   @Override
   @SuppressWarnings({"TypeParameterUnusedInFormals", "unchecked"})
-  public <T extends StripeObjectInterface> T request(ApiRequest apiRequest, Type typeToken)
+  public <T extends StripeObject> T request(ApiRequest apiRequest, Type typeToken)
       throws StripeException {
 
     RequestOptions mergedOptions = RequestOptions.merge(this.options, apiRequest.getOptions());
@@ -230,7 +230,7 @@ public StripeResponse rawRequest(RawApiRequest apiRequest) throws StripeExceptio
 
   @Override
   @SuppressWarnings({"TypeParameterUnusedInFormals", "deprecation"})
-  public <T extends StripeObjectInterface> T request(
+  public <T extends StripeObject> T request(
       BaseAddress baseAddress,
       ApiResource.RequestMethod method,
       String path,

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

@@ -1,7 +1,7 @@
 package com.stripe.net;
 
 import com.stripe.exception.StripeException;
-import com.stripe.model.StripeObjectInterface;
+import com.stripe.model.StripeObject;
 import java.io.InputStream;
 import java.lang.reflect.Type;
 import java.util.Map;
@@ -10,7 +10,7 @@ public interface StripeResponseGetter {
   /** @deprecated Use {@link #request(ApiRequest, Type)} instead. */
   @SuppressWarnings("TypeParameterUnusedInFormals")
   @Deprecated
-  <T extends StripeObjectInterface> T request(
+  <T extends StripeObject> T request(
       BaseAddress baseAddress,
       ApiResource.RequestMethod method,
       String path,
@@ -21,7 +21,7 @@ <T extends StripeObjectInterface> T request(
       throws StripeException;
 
   @SuppressWarnings("TypeParameterUnusedInFormals")
-  default <T extends StripeObjectInterface> T request(ApiRequest request, Type typeToken)
+  default <T extends StripeObject> T request(ApiRequest request, Type typeToken)
       throws StripeException {
     return request(
         request.getBaseAddress(),

src/test/java/com/stripe/BaseStripeTest.java

@@ -7,7 +7,7 @@
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import com.stripe.exception.StripeException;
-import com.stripe.model.StripeObjectInterface;
+import com.stripe.model.StripeObject;
 import com.stripe.net.*;
 import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;
@@ -173,7 +173,7 @@ public static <T> void verifyRequest(
     verifyRequest(method, path, params, null);
   }
 
-  public static <T extends StripeObjectInterface> void verifyRequest(
+  public static <T extends StripeObject> void verifyRequest(
       ApiResource.RequestMethod method,
       String path,
       Map<String, Object> params,
@@ -190,7 +190,7 @@ public static <T extends StripeObjectInterface> void verifyRequest(
    * @param options request options. If null, the options are not checked.
    */
   @SuppressWarnings("AssertionFailureIgnored")
-  public static <T extends StripeObjectInterface> void verifyRequest(
+  public static <T extends StripeObject> void verifyRequest(
       BaseAddress baseAddress,
       ApiResource.RequestMethod method,
       String path,
@@ -216,8 +216,8 @@ public static <T extends StripeObjectInterface> void verifyRequest(
   }
 
   @SuppressWarnings("AssertionFailureIgnored")
-  public static <T extends StripeObjectInterface> void verifyRequest(
-      Consumer<ApiRequest> assertOnApiRequest) throws StripeException {
+  public static <T extends StripeObject> void verifyRequest(Consumer<ApiRequest> assertOnApiRequest)
+      throws StripeException {
 
     ArgumentCaptor<ApiRequest> requestCaptor = ArgumentCaptor.forClass(ApiRequest.class);
     List<AssertionError> exceptions = new ArrayList<AssertionError>();
@@ -249,7 +249,7 @@ public static <T extends StripeObjectInterface> void verifyRequest(
   }
 
   @SuppressWarnings("AssertionFailureIgnored")
-  public static <T extends StripeObjectInterface> void verifyStripeRequest(
+  public static <T extends StripeObject> void verifyStripeRequest(
       Consumer<StripeRequest> assertOnStripeRequest) throws StripeException {
 
     ArgumentCaptor<StripeRequest> requestCaptor = ArgumentCaptor.forClass(StripeRequest.class);
@@ -292,7 +292,7 @@ public static <T> void verifyNoMoreRequests() {
    * @see BaseStripeTest#stubRequest(ApiResource.RequestMethod, String, Map, RequestOptions, Class,
    *     String)
    */
-  public static <T extends StripeObjectInterface> void stubRequest(
+  public static <T extends StripeObject> void stubRequest(
       ApiResource.RequestMethod method, String path, Type typeToken, String response)
       throws StripeException {
     stubRequest(BaseAddress.API, method, path, null, null, typeToken, response);
@@ -304,7 +304,7 @@ public static <T extends StripeObjectInterface> void stubRequest(
    * @see BaseStripeTest#stubRequest(ApiResource.RequestMethod, String, Map, RequestOptions, Class,
    *     String)
    */
-  public static <T extends StripeObjectInterface> void stubRequest(
+  public static <T extends StripeObject> void stubRequest(
       ApiResource.RequestMethod method,
       String path,
       Map<String, Object> params,
@@ -325,7 +325,7 @@ public static <T extends StripeObjectInterface> void stubRequest(
    * @param typeToken Class of the API resource that will be returned for the stubbed request.
    * @param response JSON payload of the API resource that will be returned for the stubbed request.
    */
-  public static <T extends StripeObjectInterface> void stubRequest(
+  public static <T extends StripeObject> void stubRequest(
       BaseAddress baseAddress,
       ApiResource.RequestMethod method,
       String path,
@@ -361,7 +361,7 @@ public static <T extends StripeObjectInterface> void stubRequest(
    * @param typeToken Class of the API resource that will be returned for the stubbed request.
    * @param response JSON payload of the API resource that will be returned for the stubbed request.
    */
-  public static <T extends StripeObjectInterface> void stubRequestReturnError(
+  public static <T extends StripeObject> void stubRequestReturnError(
       BaseAddress baseAddress,
       ApiResource.RequestMethod method,
       String path,
@@ -380,8 +380,8 @@ public static <T extends StripeObjectInterface> void stubRequestReturnError(
   }
 
   /** Stubs an OAuth API request. stripe-mock does not supported OAuth endpoints at this time. */
-  public static <T extends StripeObjectInterface> void stubOAuthRequest(
-      Class<T> clazz, String response) throws StripeException {
+  public static <T extends StripeObject> void stubOAuthRequest(Class<T> clazz, String response)
+      throws StripeException {
     Mockito.doReturn(ApiResource.GSON.fromJson(response, clazz))
         .when(networkSpy)
         .request(Mockito.any(ApiRequest.class), Mockito.<Type>any());