Cleanup removal of waitForAsync()

Author: rbygrave

client/src/main/java/io/avaje/http/client/DHttpClientContext.java

@@ -11,9 +11,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicReference;
-import java.util.concurrent.locks.LockSupport;
 
 class DHttpClientContext implements HttpClientContext {
 
@@ -33,7 +31,6 @@ class DHttpClientContext implements HttpClientContext {
   private final boolean withAuthToken;
   private final AuthTokenProvider authTokenProvider;
   private final AtomicReference<AuthToken> tokenRef = new AtomicReference<>();
-  private final AtomicLong activeAsync = new AtomicLong();
   private int loggingMaxBody = 1_000;
 
   DHttpClientContext(HttpClient httpClient, String baseUrl, Duration requestTimeout, BodyAdapter bodyAdapter, RetryHandler retryHandler, RequestListener requestListener, AuthTokenProvider authTokenProvider, RequestIntercept intercept) {
@@ -176,7 +173,6 @@ <T> HttpResponse<T> send(HttpRequest.Builder requestBuilder, HttpResponse.BodyHa
   }
 
   <T> CompletableFuture<HttpResponse<T>> sendAsync(HttpRequest.Builder requestBuilder, HttpResponse.BodyHandler<T> bodyHandler) {
-    activeAsync.incrementAndGet();
     return httpClient.sendAsync(requestBuilder.build(), bodyHandler);
   }
 
@@ -196,28 +192,13 @@ <T> List<T> readList(Class<T> cls, BodyContent content) {
     return bodyAdapter.listReader(cls).read(content);
   }
 
-  @Override
-  public boolean waitForAsync(long millis) {
-    final long until = System.currentTimeMillis() + millis;
-    do {
-      if (activeAsync.get() <= 0) {
-        return true;
-      }
-      LockSupport.parkNanos(10_000_000);
-    } while (System.currentTimeMillis() < until);
-    return false;
-  }
-
   void afterResponse(DHttpClientRequest request) {
     if (requestListener != null) {
       requestListener.response(request.listenerEvent());
     }
     if (requestIntercept != null) {
       requestIntercept.afterResponse(request.response(), request);
     }
-    if (request.startAsyncNanos > 0) {
-      activeAsync.decrementAndGet();
-    }
   }
 
   void beforeRequest(DHttpClientRequest request) {

client/src/main/java/io/avaje/http/client/DHttpClientRequest.java

@@ -50,7 +50,7 @@ class DHttpClientRequest implements HttpClientRequest, HttpClientResponse {
   private boolean loggableResponseBody;
   private boolean skipAuthToken;
   private boolean suppressLogging;
-  protected long startAsyncNanos;
+  private long startAsyncNanos;
   private String label;
   private Map<String, Object> customAttributes;
 

client/src/main/java/io/avaje/http/client/HttpClientContext.java

@@ -115,14 +115,6 @@ static HttpClientContext.Builder newBuilder() {
    */
   byte[] decodeContent(String encoding, byte[] content);
 
-  /**
-   * Wait for any submitted async requests with a given maximum wait time.
-   *
-   * @param maxWaitMillis The maximum time to wait in milliseconds
-   * @return True if waiting was successful or false if there are still async requests that have not yet come back for completion.
-   */
-  boolean waitForAsync(long maxWaitMillis);
-
   /**
    * Builds the HttpClientContext.
    *

client/src/test/java/io/avaje/http/client/AsyncTest.java

@@ -30,10 +30,8 @@ void waitForAsync()  {
       List<String> lines = hres.body().collect(Collectors.toList());
       assertThat(lines).hasSize(4);
       assertThat(lines.get(0)).contains("{\"id\":1, \"name\":\"one\"}");
-    });
+    }).join();
 
-    assertThat(flag).isFalse();
-    assertThat(clientContext.waitForAsync(1_000)).isTrue();
     assertThat(flag).isTrue();
   }
 

client/src/test/java/org/example/github/GithubTest.java

@@ -35,12 +35,7 @@ void test() {
       .thenAccept(res -> {
         System.out.println("RES: " + res.statusCode());
         System.out.println("BODY: " + res.body().substring(0, 150) + "...");
-      });
-
-    long st = System.currentTimeMillis();
-    System.out.println("waitForAsync");
-    boolean waitSuccess = clientContext.waitForAsync(2_000);
-    System.out.println("waitForAsync waitSuccess:" + waitSuccess + " waitMillis: " + (System.currentTimeMillis() - st));
+      }).join();
   }
 
 }