#23700 Do not import ApiClient when supportUrlQuery is false (#23708)

* #23700 Do not import ApiClient when supportUrlQuery is false

* #23700 Include generated classes

* #23700 Remove spurious and unnecessary debug comment

Author: sjw2547

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

@@ -25,7 +25,9 @@ import {{jacksonPackage}}.databind.annotation.JsonDeserialize;
 import {{jacksonPackage}}.databind.annotation.JsonSerialize;
 import {{jacksonPackage}}.databind.deser.std.StdDeserializer;
 import {{jacksonPackage}}.databind.ser.std.StdSerializer;
+{{#supportUrlQuery}}
 import {{invokerPackage}}.ApiClient;
+{{/supportUrlQuery}}
 import {{invokerPackage}}.JSON;
 
 {{>additionalModelTypeAnnotations}}{{>generatedAnnotation}}{{>xmlAnnotation}}

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

@@ -27,7 +27,9 @@ import {{jacksonPackage}}.databind.annotation.JsonDeserialize;
 import {{jacksonPackage}}.databind.annotation.JsonSerialize;
 import {{jacksonPackage}}.databind.deser.std.StdDeserializer;
 import {{jacksonPackage}}.databind.ser.std.StdSerializer;
+{{#supportUrlQuery}}
 import {{invokerPackage}}.ApiClient;
+{{/supportUrlQuery}}
 import {{invokerPackage}}.JSON;
 
 {{>additionalModelTypeAnnotations}}{{>generatedAnnotation}}{{>xmlAnnotation}}