unreflect close

Author: SentryMan

http-client/src/main/java/io/avaje/http/client/DHttpClientBuilder.java

@@ -104,7 +104,7 @@ private java.net.http.HttpClient defaultClient() {
     if (executor != null) {
       builder.executor(executor);
     } else if (Runtime.version().feature() >= 21) {
-      builder.executor(HttpExecutor.getExecutor());
+      builder.executor(JDK21Functions.getExecutor());
     }
     if (proxy != null) {
       builder.proxy(proxy);

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

@@ -2,8 +2,6 @@
 
 import io.avaje.applog.AppLog;
 
-import java.lang.invoke.MethodHandles;
-import java.lang.invoke.MethodType;
 import java.lang.reflect.Type;
 import java.net.http.HttpHeaders;
 import java.net.http.HttpRequest;
@@ -124,9 +122,8 @@ public HttpClient.Metrics metrics() {
   public HttpClient.Metrics metrics(boolean reset) {
     if (reset) {
       return new DMetrics(metricResTotal.sumThenReset(), metricResError.sumThenReset(), metricResBytes.sumThenReset(), metricResMicros.sumThenReset(), metricResMaxMicros.getThenReset());
-    } else {
-      return new DMetrics(metricResTotal.sum(), metricResError.sum(), metricResBytes.sum(), metricResMicros.sum(), metricResMaxMicros.get());
     }
+    return new DMetrics(metricResTotal.sum(), metricResError.sum(), metricResBytes.sum(), metricResMicros.sum(), metricResMaxMicros.get());
   }
 
   void metricsString(int stringBody) {
@@ -395,14 +392,6 @@ String maxResponseBody(String body) {
   @Override
   public void close() {
     this.closed = true;
-    if (Integer.getInteger("java.specification.version") >= 21) {
-      try {
-        MethodHandles.lookup()
-            .findVirtual(java.net.http.HttpClient.class, "close", MethodType.methodType(void.class))
-            .invokeExact(httpClient);
-      } catch (Throwable t) {
-        throw new IllegalStateException("Failed to close java.net.http.HttpClient instance");
-      }
-    }
+    JDK21Functions.closeClient(httpClient);
   }
 }

…a/io/avaje/http/client/HttpExecutor.java …io/avaje/http/client/JDK21Functions.javahttp-client/src/main/java/io/avaje/http/client/HttpExecutor.java renamed to http-client/src/main/java/io/avaje/http/client/JDK21Functions.java http-client/src/main/java/io/avaje/http/client/HttpExecutor.java renamed to http-client/src/main/java/io/avaje/http/client/JDK21Functions.java

@@ -1,12 +1,18 @@
 package io.avaje.http.client;
 
+import java.net.http.HttpClient;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-final class HttpExecutor {
-  private HttpExecutor() {}
-  //only executed in tests
+final class JDK21Functions {
+  private JDK21Functions() {}
+
+  // only executed in tests
   static ExecutorService getExecutor() {
     return Executors.newCachedThreadPool();
   }
+
+  static void closeClient(HttpClient client) {
+    client.close();
+  }
 }

…1/io/avaje/http/client/HttpExecutor.java …io/avaje/http/client/JDK21Functions.javahttp-client/src/main/java21/io/avaje/http/client/HttpExecutor.java renamed to http-client/src/main/java21/io/avaje/http/client/JDK21Functions.java http-client/src/main/java21/io/avaje/http/client/HttpExecutor.java renamed to http-client/src/main/java21/io/avaje/http/client/JDK21Functions.java

@@ -1,11 +1,17 @@
 package io.avaje.http.client;
 
+import java.net.http.HttpClient;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-final class HttpExecutor {
-  private HttpExecutor() {}
+final class JDK21Functions {
+  private JDK21Functions() {}
+
   static ExecutorService getExecutor() {
     return Executors.newVirtualThreadPerTaskExecutor();
   }
+
+  static void closeClient(HttpClient client) {
+    client.close();
+  }
 }