WIP

stripe · May 17, 2021 · 92c9ff3 · 92c9ff3
1 parent 1e4f734
commit 92c9ff3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/...m/stripe/net/StripeResponseInterface.java → ...om/stripe/net/AbstractStripeResponse.java b/...m/stripe/net/StripeResponseInterface.java → ...om/stripe/net/AbstractStripeResponse.java
diff --git a/src/main/java/com/stripe/net/HttpClient.java b/src/main/java/com/stripe/net/HttpClient.java
@@ -54,7 +54,7 @@ private interface RequestSendFunction<R> {
     R apply(StripeRequest request) throws StripeException;
   }
 
-  private <T extends StripeResponseInterface> T sendWithTelemetry(
+  private <T extends AbstractStripeResponse<?>> T sendWithTelemetry(
       StripeRequest request, RequestSendFunction<T> send) throws StripeException {
     Optional<String> telemetryHeaderValue = requestTelemetry.getHeaderValue(request.headers());
     if (telemetryHeaderValue.isPresent()) {
@@ -81,7 +81,7 @@ private <T extends StripeResponseInterface> T sendWithTelemetry(
    * @throws StripeException If the request fails for any reason
    */
   public StripeResponse requestWithTelemetry(StripeRequest request) throws StripeException {
-    return sendWithTelemetry(request, (r) -> this.request(r));
+    return sendWithTelemetry(request, this::request);
   }
 
   /**
@@ -94,10 +94,10 @@ public StripeResponse requestWithTelemetry(StripeRequest request) throws StripeE
    */
   public StripeResponseStream requestStreamWithTelemetry(StripeRequest request)
       throws StripeException {
-    return sendWithTelemetry(request, (r) -> this.requestStream(r));
+    return sendWithTelemetry(request, this::requestStream);
   }
 
-  public <T extends StripeResponseInterface> T sendWithRetries(
+  public <T extends AbstractStripeResponse<?>> T sendWithRetries(
       StripeRequest request, RequestSendFunction<T> send) throws StripeException {
     ApiConnectionException requestException = null;
     T response = null;
@@ -218,7 +218,7 @@ private static String formatAppInfo(Map<String, String> info) {
     return str;
   }
 
-  private <T extends StripeResponseInterface> boolean shouldRetry(
+  private <T extends AbstractStripeResponse<?>> boolean shouldRetry(
       int numRetries, StripeException exception, StripeRequest request, T response) {
     // Do not retry if we are out of retries.
     if (numRetries >= request.options().getMaxNetworkRetries()) {

diff --git a/src/main/java/com/stripe/net/RequestTelemetry.java b/src/main/java/com/stripe/net/RequestTelemetry.java
@@ -52,7 +52,7 @@ public Optional<String> getHeaderValue(HttpHeaders headers) {
    * @param response the Stripe response
    * @param duration the request duration
    */
-  public void maybeEnqueueMetrics(StripeResponseInterface response, Duration duration) {
+  public void maybeEnqueueMetrics(AbstractStripeResponse<?> response, Duration duration) {
     if (!Stripe.enableTelemetry) {
       return;
     }