#23700 Do not import ApiClient when supportUrlQuery is false

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}}
@@ -428,6 +430,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
         {{/isPrimitiveType}}
         {{^isPrimitiveType}}
         {{#isModel}}
+            // 1
         if (getActualInstance() != null) {
           joiner.add((({{{dataType}}})getActualInstance()).toUrlQueryString(prefix + "{{{baseName}}}" + suffix));
         }