[java][native] make generated APIs AutoCloseable and close the owned HttpClient

modules/openapi-generator/src/main/resources/Java/libraries/native/api.mustache

@@ -65,7 +65,7 @@ import java.util.concurrent.CompletableFuture;
 {{>generatedAnnotation}}
 
 {{#operations}}
-public class {{classname}} {
+public class {{classname}} implements AutoCloseable {
   /**
    * Utility class for extending HttpRequest.Builder functionality.
    */
@@ -955,5 +955,20 @@ public class {{classname}} {
   {{/hasParams}}
   {{/vendorExtensions.x-group-parameters}}
   {{/operation}}
+  /**
+   * Closes the {@link HttpClient} that this instance created from the {@link ApiClient}
+   * it was constructed with. {@code ApiClient.getHttpClient()} builds a new client on
+   * every call, so the client held here is owned exclusively by this instance and is not
+   * shared with any other API instance.
+   *
+   * <p>{@link HttpClient} only became {@link AutoCloseable} in Java 21, hence the guard;
+   * on earlier runtimes there is no way to release the client's threads early.
+   */
+  @Override
+  public void close() throws Exception {
+    if (memberVarHttpClient instanceof AutoCloseable) {
+      ((AutoCloseable) memberVarHttpClient).close();
+    }
+  }
 }
 {{/operations}}

samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/AuthApi.java

@@ -45,7 +45,7 @@
 import java.util.function.Consumer;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.26.0-SNAPSHOT")
-public class AuthApi {
+public class AuthApi implements AutoCloseable {
   /**
    * Utility class for extending HttpRequest.Builder functionality.
    */
@@ -367,4 +367,19 @@ private HttpRequest.Builder testAuthHttpBearerRequestBuilder(Map<String, String>
     return localVarRequestBuilder;
   }
 
+  /**
+   * Closes the {@link HttpClient} that this instance created from the {@link ApiClient}
+   * it was constructed with. {@code ApiClient.getHttpClient()} builds a new client on
+   * every call, so the client held here is owned exclusively by this instance and is not
+   * shared with any other API instance.
+   *
+   * <p>{@link HttpClient} only became {@link AutoCloseable} in Java 21, hence the guard;
+   * on earlier runtimes there is no way to release the client's threads early.
+   */
+  @Override
+  public void close() throws Exception {
+    if (memberVarHttpClient instanceof AutoCloseable) {
+      ((AutoCloseable) memberVarHttpClient).close();
+    }
+  }
 }

samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/BodyApi.java

@@ -55,7 +55,7 @@
 import java.util.function.Consumer;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.26.0-SNAPSHOT")
-public class BodyApi {
+public class BodyApi implements AutoCloseable {
   /**
    * Utility class for extending HttpRequest.Builder functionality.
    */
@@ -1376,4 +1376,19 @@ private HttpRequest.Builder testEchoBodyTagResponseStringRequestBuilder(@javax.a
     return localVarRequestBuilder;
   }
 
+  /**
+   * Closes the {@link HttpClient} that this instance created from the {@link ApiClient}
+   * it was constructed with. {@code ApiClient.getHttpClient()} builds a new client on
+   * every call, so the client held here is owned exclusively by this instance and is not
+   * shared with any other API instance.
+   *
+   * <p>{@link HttpClient} only became {@link AutoCloseable} in Java 21, hence the guard;
+   * on earlier runtimes there is no way to release the client's threads early.
+   */
+  @Override
+  public void close() throws Exception {
+    if (memberVarHttpClient instanceof AutoCloseable) {
+      ((AutoCloseable) memberVarHttpClient).close();
+    }
+  }
 }

samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/FormApi.java

@@ -52,7 +52,7 @@
 import java.util.function.Consumer;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.26.0-SNAPSHOT")
-public class FormApi {
+public class FormApi implements AutoCloseable {
   /**
    * Utility class for extending HttpRequest.Builder functionality.
    */
@@ -607,4 +607,19 @@ private HttpRequest.Builder testFormOneofRequestBuilder(@javax.annotation.Nullab
     return localVarRequestBuilder;
   }
 
+  /**
+   * Closes the {@link HttpClient} that this instance created from the {@link ApiClient}
+   * it was constructed with. {@code ApiClient.getHttpClient()} builds a new client on
+   * every call, so the client held here is owned exclusively by this instance and is not
+   * shared with any other API instance.
+   *
+   * <p>{@link HttpClient} only became {@link AutoCloseable} in Java 21, hence the guard;
+   * on earlier runtimes there is no way to release the client's threads early.
+   */
+  @Override
+  public void close() throws Exception {
+    if (memberVarHttpClient instanceof AutoCloseable) {
+      ((AutoCloseable) memberVarHttpClient).close();
+    }
+  }
 }

samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/HeaderApi.java

@@ -52,7 +52,7 @@
 import java.util.function.Consumer;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.26.0-SNAPSHOT")
-public class HeaderApi {
+public class HeaderApi implements AutoCloseable {
   /**
    * Utility class for extending HttpRequest.Builder functionality.
    */
@@ -306,4 +306,19 @@ private HttpRequest.Builder testHeaderIntegerBooleanStringEnumsRequestBuilder(@j
     return localVarRequestBuilder;
   }
 
+  /**
+   * Closes the {@link HttpClient} that this instance created from the {@link ApiClient}
+   * it was constructed with. {@code ApiClient.getHttpClient()} builds a new client on
+   * every call, so the client held here is owned exclusively by this instance and is not
+   * shared with any other API instance.
+   *
+   * <p>{@link HttpClient} only became {@link AutoCloseable} in Java 21, hence the guard;
+   * on earlier runtimes there is no way to release the client's threads early.
+   */
+  @Override
+  public void close() throws Exception {
+    if (memberVarHttpClient instanceof AutoCloseable) {
+      ((AutoCloseable) memberVarHttpClient).close();
+    }
+  }
 }

samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/PathApi.java

@@ -52,7 +52,7 @@
 import java.util.function.Consumer;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.26.0-SNAPSHOT")
-public class PathApi {
+public class PathApi implements AutoCloseable {
   /**
    * Utility class for extending HttpRequest.Builder functionality.
    */
@@ -307,4 +307,19 @@ private HttpRequest.Builder testsPathStringPathStringIntegerPathIntegerEnumNonre
     return localVarRequestBuilder;
   }
 
+  /**
+   * Closes the {@link HttpClient} that this instance created from the {@link ApiClient}
+   * it was constructed with. {@code ApiClient.getHttpClient()} builds a new client on
+   * every call, so the client held here is owned exclusively by this instance and is not
+   * shared with any other API instance.
+   *
+   * <p>{@link HttpClient} only became {@link AutoCloseable} in Java 21, hence the guard;
+   * on earlier runtimes there is no way to release the client's threads early.
+   */
+  @Override
+  public void close() throws Exception {
+    if (memberVarHttpClient instanceof AutoCloseable) {
+      ((AutoCloseable) memberVarHttpClient).close();
+    }
+  }
 }

samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/QueryApi.java

@@ -58,7 +58,7 @@
 import java.util.function.Consumer;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.26.0-SNAPSHOT")
-public class QueryApi {
+public class QueryApi implements AutoCloseable {
   /**
    * Utility class for extending HttpRequest.Builder functionality.
    */
@@ -1567,4 +1567,19 @@ private HttpRequest.Builder testQueryStyleJsonSerializationObjectRequestBuilder(
     return localVarRequestBuilder;
   }
 
+  /**
+   * Closes the {@link HttpClient} that this instance created from the {@link ApiClient}
+   * it was constructed with. {@code ApiClient.getHttpClient()} builds a new client on
+   * every call, so the client held here is owned exclusively by this instance and is not
+   * shared with any other API instance.
+   *
+   * <p>{@link HttpClient} only became {@link AutoCloseable} in Java 21, hence the guard;
+   * on earlier runtimes there is no way to release the client's threads early.
+   */
+  @Override
+  public void close() throws Exception {
+    if (memberVarHttpClient instanceof AutoCloseable) {
+      ((AutoCloseable) memberVarHttpClient).close();
+    }
+  }
 }

samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/AnotherFakeApi.java

@@ -48,7 +48,7 @@
 import java.util.concurrent.CompletableFuture;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.26.0-SNAPSHOT")
-public class AnotherFakeApi {
+public class AnotherFakeApi implements AutoCloseable {
   /**
    * Utility class for extending HttpRequest.Builder functionality.
    */
@@ -297,4 +297,19 @@ private HttpRequest.Builder call123testSpecialTagsRequestBuilder(@javax.annotati
     return localVarRequestBuilder;
   }
 
+  /**
+   * Closes the {@link HttpClient} that this instance created from the {@link ApiClient}
+   * it was constructed with. {@code ApiClient.getHttpClient()} builds a new client on
+   * every call, so the client held here is owned exclusively by this instance and is not
+   * shared with any other API instance.
+   *
+   * <p>{@link HttpClient} only became {@link AutoCloseable} in Java 21, hence the guard;
+   * on earlier runtimes there is no way to release the client's threads early.
+   */
+  @Override
+  public void close() throws Exception {
+    if (memberVarHttpClient instanceof AutoCloseable) {
+      ((AutoCloseable) memberVarHttpClient).close();
+    }
+  }
 }

samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/DefaultApi.java

@@ -48,7 +48,7 @@
 import java.util.concurrent.CompletableFuture;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.26.0-SNAPSHOT")
-public class DefaultApi {
+public class DefaultApi implements AutoCloseable {
   /**
    * Utility class for extending HttpRequest.Builder functionality.
    */
@@ -283,4 +283,19 @@ private HttpRequest.Builder fooGetRequestBuilder(Map<String, String> headers) th
     return localVarRequestBuilder;
   }
 
+  /**
+   * Closes the {@link HttpClient} that this instance created from the {@link ApiClient}
+   * it was constructed with. {@code ApiClient.getHttpClient()} builds a new client on
+   * every call, so the client held here is owned exclusively by this instance and is not
+   * shared with any other API instance.
+   *
+   * <p>{@link HttpClient} only became {@link AutoCloseable} in Java 21, hence the guard;
+   * on earlier runtimes there is no way to release the client's threads early.
+   */
+  @Override
+  public void close() throws Exception {
+    if (memberVarHttpClient instanceof AutoCloseable) {
+      ((AutoCloseable) memberVarHttpClient).close();
+    }
+  }
 }

samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeApi.java

@@ -65,7 +65,7 @@
 import java.util.concurrent.CompletableFuture;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.26.0-SNAPSHOT")
-public class FakeApi {
+public class FakeApi implements AutoCloseable {
   /**
    * Utility class for extending HttpRequest.Builder functionality.
    */
@@ -3051,4 +3051,19 @@ private HttpRequest.Builder testStringMapReferenceRequestBuilder(@javax.annotati
     return localVarRequestBuilder;
   }
 
+  /**
+   * Closes the {@link HttpClient} that this instance created from the {@link ApiClient}
+   * it was constructed with. {@code ApiClient.getHttpClient()} builds a new client on
+   * every call, so the client held here is owned exclusively by this instance and is not
+   * shared with any other API instance.
+   *
+   * <p>{@link HttpClient} only became {@link AutoCloseable} in Java 21, hence the guard;
+   * on earlier runtimes there is no way to release the client's threads early.
+   */
+  @Override
+  public void close() throws Exception {
+    if (memberVarHttpClient instanceof AutoCloseable) {
+      ((AutoCloseable) memberVarHttpClient).close();
+    }
+  }
 }

samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java

@@ -54,7 +54,7 @@
 import java.util.concurrent.CompletableFuture;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.26.0-SNAPSHOT")
-public class FakeClassnameTags123Api {
+public class FakeClassnameTags123Api implements AutoCloseable {
   /**
    * Utility class for extending HttpRequest.Builder functionality.
    */
@@ -303,4 +303,19 @@ private HttpRequest.Builder testClassnameRequestBuilder(@javax.annotation.Nonnul
     return localVarRequestBuilder;
   }
 
+  /**
+   * Closes the {@link HttpClient} that this instance created from the {@link ApiClient}
+   * it was constructed with. {@code ApiClient.getHttpClient()} builds a new client on
+   * every call, so the client held here is owned exclusively by this instance and is not
+   * shared with any other API instance.
+   *
+   * <p>{@link HttpClient} only became {@link AutoCloseable} in Java 21, hence the guard;
+   * on earlier runtimes there is no way to release the client's threads early.
+   */
+  @Override
+  public void close() throws Exception {
+    if (memberVarHttpClient instanceof AutoCloseable) {
+      ((AutoCloseable) memberVarHttpClient).close();
+    }
+  }
 }

samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/PetApi.java

@@ -56,7 +56,7 @@
 import java.util.concurrent.CompletableFuture;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.26.0-SNAPSHOT")
-public class PetApi {
+public class PetApi implements AutoCloseable {
   /**
    * Utility class for extending HttpRequest.Builder functionality.
    */
@@ -1429,4 +1429,19 @@ private HttpRequest.Builder uploadFileWithRequiredFileRequestBuilder(@javax.anno
     return localVarRequestBuilder;
   }
 
+  /**
+   * Closes the {@link HttpClient} that this instance created from the {@link ApiClient}
+   * it was constructed with. {@code ApiClient.getHttpClient()} builds a new client on
+   * every call, so the client held here is owned exclusively by this instance and is not
+   * shared with any other API instance.
+   *
+   * <p>{@link HttpClient} only became {@link AutoCloseable} in Java 21, hence the guard;
+   * on earlier runtimes there is no way to release the client's threads early.
+   */
+  @Override
+  public void close() throws Exception {
+    if (memberVarHttpClient instanceof AutoCloseable) {
+      ((AutoCloseable) memberVarHttpClient).close();
+    }
+  }
 }

samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/StoreApi.java

@@ -54,7 +54,7 @@
 import java.util.concurrent.CompletableFuture;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.26.0-SNAPSHOT")
-public class StoreApi {
+public class StoreApi implements AutoCloseable {
   /**
    * Utility class for extending HttpRequest.Builder functionality.
    */
@@ -660,4 +660,19 @@ private HttpRequest.Builder placeOrderRequestBuilder(@javax.annotation.Nonnull O
     return localVarRequestBuilder;
   }
 
+  /**
+   * Closes the {@link HttpClient} that this instance created from the {@link ApiClient}
+   * it was constructed with. {@code ApiClient.getHttpClient()} builds a new client on
+   * every call, so the client held here is owned exclusively by this instance and is not
+   * shared with any other API instance.
+   *
+   * <p>{@link HttpClient} only became {@link AutoCloseable} in Java 21, hence the guard;
+   * on earlier runtimes there is no way to release the client's threads early.
+   */
+  @Override
+  public void close() throws Exception {
+    if (memberVarHttpClient instanceof AutoCloseable) {
+      ((AutoCloseable) memberVarHttpClient).close();
+    }
+  }
 }