Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wing328 merged 3 commits into from
May 7, 2026
+4 −0
Merged

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

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
97c72dc
#23700 Do not import ApiClient when supportUrlQuery is false
sjw2547 May 5, 2026
60b5fd4
#23700 Include generated classes
sjw2547 May 6, 2026
77c3431
#23700 Remove spurious and unnecessary debug comment
sjw2547 May 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions modules/openapi-generator/src/main/resources/Java/libraries/native/anyof_model.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Expand Down
3 changes: 3 additions & 0 deletions modules/openapi-generator/src/main/resources/Java/libraries/native/oneof_model.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Expand Down Expand Up @@ -428,6 +430,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
{{/isPrimitiveType}}
{{^isPrimitiveType}}
{{#isModel}}
// 1
Comment thread
sjw2547 marked this conversation as resolved.
Outdated
if (getActualInstance() != null) {
joiner.add((({{{dataType}}})getActualInstance()).toUrlQueryString(prefix + "{{{baseName}}}" + suffix));
}
Expand Down
2 changes: 2 additions & 0 deletions .../client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Fruit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,12 +280,14 @@ public String toUrlQueryString(String prefix) {
StringJoiner joiner = new StringJoiner("&");

if (getActualInstance() instanceof Apple) {
// 1
if (getActualInstance() != null) {
joiner.add(((Apple)getActualInstance()).toUrlQueryString(prefix + "one_of_0" + suffix));
}
return joiner.toString();
}
if (getActualInstance() instanceof Banana) {
// 1
if (getActualInstance() != null) {
joiner.add(((Banana)getActualInstance()).toUrlQueryString(prefix + "one_of_1" + suffix));
}
Expand Down
2 changes: 2 additions & 0 deletions ...ient/petstore/java/native-async/src/main/java/org/openapitools/client/model/FruitReq.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,12 +280,14 @@ public String toUrlQueryString(String prefix) {
StringJoiner joiner = new StringJoiner("&");

if (getActualInstance() instanceof AppleReq) {
// 1
if (getActualInstance() != null) {
joiner.add(((AppleReq)getActualInstance()).toUrlQueryString(prefix + "one_of_0" + suffix));
}
return joiner.toString();
}
if (getActualInstance() instanceof BananaReq) {
// 1
if (getActualInstance() != null) {
joiner.add(((BananaReq)getActualInstance()).toUrlQueryString(prefix + "one_of_1" + suffix));
}
Expand Down
2 changes: 2 additions & 0 deletions ...client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Mammal.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,7 @@ public String toUrlQueryString(String prefix) {
StringJoiner joiner = new StringJoiner("&");

if (getActualInstance() instanceof Whale) {
// 1
if (getActualInstance() != null) {
joiner.add(((Whale)getActualInstance()).toUrlQueryString(prefix + "one_of_0" + suffix));
}
Expand All @@ -350,6 +351,7 @@ public String toUrlQueryString(String prefix) {
return joiner.toString();
}
if (getActualInstance() instanceof Pig) {
// 1
if (getActualInstance() != null) {
joiner.add(((Pig)getActualInstance()).toUrlQueryString(prefix + "one_of_2" + suffix));
}
Expand Down
2 changes: 2 additions & 0 deletions ...petstore/java/native-async/src/main/java/org/openapitools/client/model/NullableShape.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,12 +295,14 @@ public String toUrlQueryString(String prefix) {
StringJoiner joiner = new StringJoiner("&");

if (getActualInstance() instanceof Triangle) {
// 1
if (getActualInstance() != null) {
joiner.add(((Triangle)getActualInstance()).toUrlQueryString(prefix + "one_of_0" + suffix));
}
return joiner.toString();
}
if (getActualInstance() instanceof Quadrilateral) {
// 1
if (getActualInstance() != null) {
joiner.add(((Quadrilateral)getActualInstance()).toUrlQueryString(prefix + "one_of_1" + suffix));
}
Expand Down
2 changes: 2 additions & 0 deletions ...es/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Pig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,12 +288,14 @@ public String toUrlQueryString(String prefix) {
StringJoiner joiner = new StringJoiner("&");

if (getActualInstance() instanceof BasquePig) {
// 1
if (getActualInstance() != null) {
joiner.add(((BasquePig)getActualInstance()).toUrlQueryString(prefix + "one_of_0" + suffix));
}
return joiner.toString();
}
if (getActualInstance() instanceof DanishPig) {
// 1
if (getActualInstance() != null) {
joiner.add(((DanishPig)getActualInstance()).toUrlQueryString(prefix + "one_of_1" + suffix));
}
Expand Down
2 changes: 2 additions & 0 deletions ...petstore/java/native-async/src/main/java/org/openapitools/client/model/Quadrilateral.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,12 +288,14 @@ public String toUrlQueryString(String prefix) {
StringJoiner joiner = new StringJoiner("&");

if (getActualInstance() instanceof SimpleQuadrilateral) {
// 1
if (getActualInstance() != null) {
joiner.add(((SimpleQuadrilateral)getActualInstance()).toUrlQueryString(prefix + "one_of_0" + suffix));
}
return joiner.toString();
}
if (getActualInstance() instanceof ComplexQuadrilateral) {
// 1
if (getActualInstance() != null) {
joiner.add(((ComplexQuadrilateral)getActualInstance()).toUrlQueryString(prefix + "one_of_1" + suffix));
}
Expand Down
2 changes: 2 additions & 0 deletions .../client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Shape.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,12 +288,14 @@ public String toUrlQueryString(String prefix) {
StringJoiner joiner = new StringJoiner("&");

if (getActualInstance() instanceof Triangle) {
// 1
if (getActualInstance() != null) {
joiner.add(((Triangle)getActualInstance()).toUrlQueryString(prefix + "one_of_0" + suffix));
}
return joiner.toString();
}
if (getActualInstance() instanceof Quadrilateral) {
// 1
if (getActualInstance() != null) {
joiner.add(((Quadrilateral)getActualInstance()).toUrlQueryString(prefix + "one_of_1" + suffix));
}
Expand Down
2 changes: 2 additions & 0 deletions ...t/petstore/java/native-async/src/main/java/org/openapitools/client/model/ShapeOrNull.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,12 +288,14 @@ public String toUrlQueryString(String prefix) {
StringJoiner joiner = new StringJoiner("&");

if (getActualInstance() instanceof Triangle) {
// 1
if (getActualInstance() != null) {
joiner.add(((Triangle)getActualInstance()).toUrlQueryString(prefix + "one_of_0" + suffix));
}
return joiner.toString();
}
if (getActualInstance() instanceof Quadrilateral) {
// 1
if (getActualInstance() != null) {
joiner.add(((Quadrilateral)getActualInstance()).toUrlQueryString(prefix + "one_of_1" + suffix));
}
Expand Down
3 changes: 3 additions & 0 deletions ...ient/petstore/java/native-async/src/main/java/org/openapitools/client/model/Triangle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,18 +338,21 @@ public String toUrlQueryString(String prefix) {
StringJoiner joiner = new StringJoiner("&");

if (getActualInstance() instanceof EquilateralTriangle) {
// 1
if (getActualInstance() != null) {
joiner.add(((EquilateralTriangle)getActualInstance()).toUrlQueryString(prefix + "one_of_0" + suffix));
}
return joiner.toString();
}
if (getActualInstance() instanceof IsoscelesTriangle) {
// 1
if (getActualInstance() != null) {
joiner.add(((IsoscelesTriangle)getActualInstance()).toUrlQueryString(prefix + "one_of_1" + suffix));
}
return joiner.toString();
}
if (getActualInstance() instanceof ScaleneTriangle) {
// 1
if (getActualInstance() != null) {
joiner.add(((ScaleneTriangle)getActualInstance()).toUrlQueryString(prefix + "one_of_2" + suffix));
}
Expand Down
2 changes: 2 additions & 0 deletions ...ient/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/Fruit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,12 +280,14 @@ public String toUrlQueryString(String prefix) {
StringJoiner joiner = new StringJoiner("&");

if (getActualInstance() instanceof Apple) {
// 1
if (getActualInstance() != null) {
joiner.add(((Apple)getActualInstance()).toUrlQueryString(prefix + "one_of_0" + suffix));
}
return joiner.toString();
}
if (getActualInstance() instanceof Banana) {
// 1
if (getActualInstance() != null) {
joiner.add(((Banana)getActualInstance()).toUrlQueryString(prefix + "one_of_1" + suffix));
}
Expand Down
2 changes: 2 additions & 0 deletions ...t/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/FruitReq.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,12 +280,14 @@ public String toUrlQueryString(String prefix) {
StringJoiner joiner = new StringJoiner("&");

if (getActualInstance() instanceof AppleReq) {
// 1
if (getActualInstance() != null) {
joiner.add(((AppleReq)getActualInstance()).toUrlQueryString(prefix + "one_of_0" + suffix));
}
return joiner.toString();
}
if (getActualInstance() instanceof BananaReq) {
// 1
if (getActualInstance() != null) {
joiner.add(((BananaReq)getActualInstance()).toUrlQueryString(prefix + "one_of_1" + suffix));
}
Expand Down
2 changes: 2 additions & 0 deletions ...ent/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/Mammal.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,7 @@ public String toUrlQueryString(String prefix) {
StringJoiner joiner = new StringJoiner("&");

if (getActualInstance() instanceof Whale) {
// 1
if (getActualInstance() != null) {
joiner.add(((Whale)getActualInstance()).toUrlQueryString(prefix + "one_of_0" + suffix));
}
Expand All @@ -350,6 +351,7 @@ public String toUrlQueryString(String prefix) {
return joiner.toString();
}
if (getActualInstance() instanceof Pig) {
// 1
if (getActualInstance() != null) {
joiner.add(((Pig)getActualInstance()).toUrlQueryString(prefix + "one_of_2" + suffix));
}
Expand Down
2 changes: 2 additions & 0 deletions ...store/java/native-jackson3/src/main/java/org/openapitools/client/model/NullableShape.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,12 +294,14 @@ public String toUrlQueryString(String prefix) {
StringJoiner joiner = new StringJoiner("&");

if (getActualInstance() instanceof Triangle) {
// 1
if (getActualInstance() != null) {
joiner.add(((Triangle)getActualInstance()).toUrlQueryString(prefix + "one_of_0" + suffix));
}
return joiner.toString();
}
if (getActualInstance() instanceof Quadrilateral) {
// 1
if (getActualInstance() != null) {
joiner.add(((Quadrilateral)getActualInstance()).toUrlQueryString(prefix + "one_of_1" + suffix));
}
Expand Down
2 changes: 2 additions & 0 deletions ...client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/Pig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,12 +287,14 @@ public String toUrlQueryString(String prefix) {
StringJoiner joiner = new StringJoiner("&");

if (getActualInstance() instanceof BasquePig) {
// 1
if (getActualInstance() != null) {
joiner.add(((BasquePig)getActualInstance()).toUrlQueryString(prefix + "one_of_0" + suffix));
}
return joiner.toString();
}
if (getActualInstance() instanceof DanishPig) {
// 1
if (getActualInstance() != null) {
joiner.add(((DanishPig)getActualInstance()).toUrlQueryString(prefix + "one_of_1" + suffix));
}
Expand Down
2 changes: 2 additions & 0 deletions ...store/java/native-jackson3/src/main/java/org/openapitools/client/model/Quadrilateral.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,12 +287,14 @@ public String toUrlQueryString(String prefix) {
StringJoiner joiner = new StringJoiner("&");

if (getActualInstance() instanceof SimpleQuadrilateral) {
// 1
if (getActualInstance() != null) {
joiner.add(((SimpleQuadrilateral)getActualInstance()).toUrlQueryString(prefix + "one_of_0" + suffix));
}
return joiner.toString();
}
if (getActualInstance() instanceof ComplexQuadrilateral) {
// 1
if (getActualInstance() != null) {
joiner.add(((ComplexQuadrilateral)getActualInstance()).toUrlQueryString(prefix + "one_of_1" + suffix));
}
Expand Down
2 changes: 2 additions & 0 deletions ...ient/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/Shape.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,12 +287,14 @@ public String toUrlQueryString(String prefix) {
StringJoiner joiner = new StringJoiner("&");

if (getActualInstance() instanceof Triangle) {
// 1
if (getActualInstance() != null) {
joiner.add(((Triangle)getActualInstance()).toUrlQueryString(prefix + "one_of_0" + suffix));
}
return joiner.toString();
}
if (getActualInstance() instanceof Quadrilateral) {
// 1
if (getActualInstance() != null) {
joiner.add(((Quadrilateral)getActualInstance()).toUrlQueryString(prefix + "one_of_1" + suffix));
}
Expand Down
2 changes: 2 additions & 0 deletions ...etstore/java/native-jackson3/src/main/java/org/openapitools/client/model/ShapeOrNull.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,12 +287,14 @@ public String toUrlQueryString(String prefix) {
StringJoiner joiner = new StringJoiner("&");

if (getActualInstance() instanceof Triangle) {
// 1
if (getActualInstance() != null) {
joiner.add(((Triangle)getActualInstance()).toUrlQueryString(prefix + "one_of_0" + suffix));
}
return joiner.toString();
}
if (getActualInstance() instanceof Quadrilateral) {
// 1
if (getActualInstance() != null) {
joiner.add(((Quadrilateral)getActualInstance()).toUrlQueryString(prefix + "one_of_1" + suffix));
}
Expand Down
3 changes: 3 additions & 0 deletions ...t/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/Triangle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,18 +337,21 @@ public String toUrlQueryString(String prefix) {
StringJoiner joiner = new StringJoiner("&");

if (getActualInstance() instanceof EquilateralTriangle) {
// 1
if (getActualInstance() != null) {
joiner.add(((EquilateralTriangle)getActualInstance()).toUrlQueryString(prefix + "one_of_0" + suffix));
}
return joiner.toString();
}
if (getActualInstance() instanceof IsoscelesTriangle) {
// 1
if (getActualInstance() != null) {
joiner.add(((IsoscelesTriangle)getActualInstance()).toUrlQueryString(prefix + "one_of_1" + suffix));
}
return joiner.toString();
}
if (getActualInstance() instanceof ScaleneTriangle) {
// 1
if (getActualInstance() != null) {
joiner.add(((ScaleneTriangle)getActualInstance()).toUrlQueryString(prefix + "one_of_2" + suffix));
}
Expand Down
2 changes: 2 additions & 0 deletions samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Fruit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,12 +282,14 @@ public String toUrlQueryString(String prefix) {
StringJoiner joiner = new StringJoiner("&");

if (getActualInstance() instanceof Apple) {
// 1
if (getActualInstance() != null) {
joiner.add(((Apple)getActualInstance()).toUrlQueryString(prefix + "one_of_0" + suffix));
}
return joiner.toString();
}
if (getActualInstance() instanceof Banana) {
// 1
if (getActualInstance() != null) {
joiner.add(((Banana)getActualInstance()).toUrlQueryString(prefix + "one_of_1" + suffix));
}
Expand Down
2 changes: 2 additions & 0 deletions ...les/client/petstore/java/native/src/main/java/org/openapitools/client/model/FruitReq.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,12 +282,14 @@ public String toUrlQueryString(String prefix) {
StringJoiner joiner = new StringJoiner("&");

if (getActualInstance() instanceof AppleReq) {
// 1
if (getActualInstance() != null) {
joiner.add(((AppleReq)getActualInstance()).toUrlQueryString(prefix + "one_of_0" + suffix));
}
return joiner.toString();
}
if (getActualInstance() instanceof BananaReq) {
// 1
if (getActualInstance() != null) {
joiner.add(((BananaReq)getActualInstance()).toUrlQueryString(prefix + "one_of_1" + suffix));
}
Expand Down
2 changes: 2 additions & 0 deletions samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Mammal.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,7 @@ public String toUrlQueryString(String prefix) {
StringJoiner joiner = new StringJoiner("&");

if (getActualInstance() instanceof Whale) {
// 1
if (getActualInstance() != null) {
joiner.add(((Whale)getActualInstance()).toUrlQueryString(prefix + "one_of_0" + suffix));
}
Expand All @@ -352,6 +353,7 @@ public String toUrlQueryString(String prefix) {
return joiner.toString();
}
if (getActualInstance() instanceof Pig) {
// 1
if (getActualInstance() != null) {
joiner.add(((Pig)getActualInstance()).toUrlQueryString(prefix + "one_of_2" + suffix));
}
Expand Down
2 changes: 2 additions & 0 deletions ...lient/petstore/java/native/src/main/java/org/openapitools/client/model/NullableShape.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,12 +297,14 @@ public String toUrlQueryString(String prefix) {
StringJoiner joiner = new StringJoiner("&");

if (getActualInstance() instanceof Triangle) {
// 1
if (getActualInstance() != null) {
joiner.add(((Triangle)getActualInstance()).toUrlQueryString(prefix + "one_of_0" + suffix));
}
return joiner.toString();
}
if (getActualInstance() instanceof Quadrilateral) {
// 1
if (getActualInstance() != null) {
joiner.add(((Quadrilateral)getActualInstance()).toUrlQueryString(prefix + "one_of_1" + suffix));
}
Expand Down
2 changes: 2 additions & 0 deletions samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Pig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,12 +290,14 @@ public String toUrlQueryString(String prefix) {
StringJoiner joiner = new StringJoiner("&");

if (getActualInstance() instanceof BasquePig) {
// 1
if (getActualInstance() != null) {
joiner.add(((BasquePig)getActualInstance()).toUrlQueryString(prefix + "one_of_0" + suffix));
}
return joiner.toString();
}
if (getActualInstance() instanceof DanishPig) {
// 1
if (getActualInstance() != null) {
joiner.add(((DanishPig)getActualInstance()).toUrlQueryString(prefix + "one_of_1" + suffix));
}
Expand Down
Loading
Loading