From 97c72dcabe8a8de82a3be3edd6aedc3369db96de Mon Sep 17 00:00:00 2001 From: Simon Wiehe Date: Wed, 6 May 2026 00:10:51 +0100 Subject: [PATCH 1/3] #23700 Do not import ApiClient when supportUrlQuery is false --- .../main/resources/Java/libraries/native/anyof_model.mustache | 2 ++ .../main/resources/Java/libraries/native/oneof_model.mustache | 3 +++ 2 files changed, 5 insertions(+) diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/anyof_model.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/anyof_model.mustache index b34e4f63e7ac..c977cbf355d2 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/native/anyof_model.mustache +++ b/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}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/oneof_model.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/oneof_model.mustache index 2b28229f94d9..7ae9af9a344d 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/native/oneof_model.mustache +++ b/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)); } From 60b5fd4ca7a0cdc8e57c26fdae6a9eb5682bc76c Mon Sep 17 00:00:00 2001 From: Simon Wiehe Date: Wed, 6 May 2026 21:48:40 +0100 Subject: [PATCH 2/3] #23700 Include generated classes --- .../src/main/java/org/openapitools/client/model/Fruit.java | 2 ++ .../src/main/java/org/openapitools/client/model/FruitReq.java | 2 ++ .../src/main/java/org/openapitools/client/model/Mammal.java | 2 ++ .../main/java/org/openapitools/client/model/NullableShape.java | 2 ++ .../src/main/java/org/openapitools/client/model/Pig.java | 2 ++ .../main/java/org/openapitools/client/model/Quadrilateral.java | 2 ++ .../src/main/java/org/openapitools/client/model/Shape.java | 2 ++ .../main/java/org/openapitools/client/model/ShapeOrNull.java | 2 ++ .../src/main/java/org/openapitools/client/model/Triangle.java | 3 +++ .../src/main/java/org/openapitools/client/model/Fruit.java | 2 ++ .../src/main/java/org/openapitools/client/model/FruitReq.java | 2 ++ .../src/main/java/org/openapitools/client/model/Mammal.java | 2 ++ .../main/java/org/openapitools/client/model/NullableShape.java | 2 ++ .../src/main/java/org/openapitools/client/model/Pig.java | 2 ++ .../main/java/org/openapitools/client/model/Quadrilateral.java | 2 ++ .../src/main/java/org/openapitools/client/model/Shape.java | 2 ++ .../main/java/org/openapitools/client/model/ShapeOrNull.java | 2 ++ .../src/main/java/org/openapitools/client/model/Triangle.java | 3 +++ .../src/main/java/org/openapitools/client/model/Fruit.java | 2 ++ .../src/main/java/org/openapitools/client/model/FruitReq.java | 2 ++ .../src/main/java/org/openapitools/client/model/Mammal.java | 2 ++ .../main/java/org/openapitools/client/model/NullableShape.java | 2 ++ .../src/main/java/org/openapitools/client/model/Pig.java | 2 ++ .../main/java/org/openapitools/client/model/Quadrilateral.java | 2 ++ .../src/main/java/org/openapitools/client/model/Shape.java | 2 ++ .../main/java/org/openapitools/client/model/ShapeOrNull.java | 2 ++ .../src/main/java/org/openapitools/client/model/Triangle.java | 3 +++ 27 files changed, 57 insertions(+) diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Fruit.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Fruit.java index a98dfb19eb29..512ead1a0f90 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Fruit.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Fruit.java @@ -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)); } diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FruitReq.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FruitReq.java index 5fa27d10310a..39cc8c11da4a 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FruitReq.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FruitReq.java @@ -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)); } diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Mammal.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Mammal.java index 7c8b1beb746a..8b078f74560c 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Mammal.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Mammal.java @@ -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)); } @@ -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)); } diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/NullableShape.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/NullableShape.java index 3f73d8989c20..8e10f20e6cef 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/NullableShape.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/NullableShape.java @@ -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)); } diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Pig.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Pig.java index 1f5a32d20e29..b44503460e4a 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Pig.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Pig.java @@ -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)); } diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Quadrilateral.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Quadrilateral.java index 3cb5ebf72acb..ace8934207cd 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Quadrilateral.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Quadrilateral.java @@ -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)); } diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Shape.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Shape.java index c5ea5de434c8..c3b7d054fc28 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Shape.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Shape.java @@ -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)); } diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ShapeOrNull.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ShapeOrNull.java index e61681144e56..4f27a2313f52 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ShapeOrNull.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ShapeOrNull.java @@ -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)); } diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Triangle.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Triangle.java index 8b1ac407fc56..fe55240c10cf 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Triangle.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Triangle.java @@ -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)); } diff --git a/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/Fruit.java b/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/Fruit.java index 945fe60ebc49..e1a4272f9576 100644 --- a/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/Fruit.java +++ b/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/Fruit.java @@ -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)); } diff --git a/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/FruitReq.java b/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/FruitReq.java index e54e3146cc66..2a72f63466c8 100644 --- a/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/FruitReq.java +++ b/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/FruitReq.java @@ -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)); } diff --git a/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/Mammal.java b/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/Mammal.java index e0f0606cfe3d..38c8adac8561 100644 --- a/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/Mammal.java +++ b/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/Mammal.java @@ -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)); } @@ -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)); } diff --git a/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/NullableShape.java b/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/NullableShape.java index 1164b325d1ad..f1c73b3d9ce8 100644 --- a/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/NullableShape.java +++ b/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/NullableShape.java @@ -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)); } diff --git a/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/Pig.java b/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/Pig.java index 74390454f43f..ae1e98094ddd 100644 --- a/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/Pig.java +++ b/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/Pig.java @@ -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)); } diff --git a/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/Quadrilateral.java b/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/Quadrilateral.java index 57ce6cb9cdc8..3bc137b2546d 100644 --- a/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/Quadrilateral.java +++ b/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/Quadrilateral.java @@ -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)); } diff --git a/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/Shape.java b/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/Shape.java index 4454617f07dd..9e1fbecb7a13 100644 --- a/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/Shape.java +++ b/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/Shape.java @@ -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)); } diff --git a/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/ShapeOrNull.java b/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/ShapeOrNull.java index 5714e8bdb40a..18d3e2562811 100644 --- a/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/ShapeOrNull.java +++ b/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/ShapeOrNull.java @@ -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)); } diff --git a/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/Triangle.java b/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/Triangle.java index c994212ac01f..a881fa83d5de 100644 --- a/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/Triangle.java +++ b/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/Triangle.java @@ -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)); } diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Fruit.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Fruit.java index 4e321df8d6c2..90a5352ebeb8 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Fruit.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Fruit.java @@ -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)); } diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FruitReq.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FruitReq.java index 8fad6c84cbee..d81bc8c9f855 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FruitReq.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FruitReq.java @@ -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)); } diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Mammal.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Mammal.java index 21980895e930..afb207663073 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Mammal.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Mammal.java @@ -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)); } @@ -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)); } diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/NullableShape.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/NullableShape.java index 0b48fcb9f0fd..b2990479d743 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/NullableShape.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/NullableShape.java @@ -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)); } diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Pig.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Pig.java index d6b7944f7896..33f94f98a409 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Pig.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Pig.java @@ -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)); } diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Quadrilateral.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Quadrilateral.java index bb076cba5038..539d1e29098d 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Quadrilateral.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Quadrilateral.java @@ -290,12 +290,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)); } diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Shape.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Shape.java index bde023a14e04..946b9036faed 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Shape.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Shape.java @@ -290,12 +290,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)); } diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ShapeOrNull.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ShapeOrNull.java index 5592919b0850..e00ac199872b 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ShapeOrNull.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ShapeOrNull.java @@ -290,12 +290,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)); } diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Triangle.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Triangle.java index f4dea0e00330..27b7ca19249b 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Triangle.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Triangle.java @@ -340,18 +340,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)); } From 77c3431d7a96ccdfe01dba2926aadd5847abbc9f Mon Sep 17 00:00:00 2001 From: Simon Wiehe Date: Thu, 7 May 2026 07:31:39 +0100 Subject: [PATCH 3/3] #23700 Remove spurious and unnecessary debug comment --- .../main/resources/Java/libraries/native/oneof_model.mustache | 1 - .../src/main/java/org/openapitools/client/model/Fruit.java | 2 -- .../src/main/java/org/openapitools/client/model/FruitReq.java | 2 -- .../src/main/java/org/openapitools/client/model/Mammal.java | 2 -- .../main/java/org/openapitools/client/model/NullableShape.java | 2 -- .../src/main/java/org/openapitools/client/model/Pig.java | 2 -- .../main/java/org/openapitools/client/model/Quadrilateral.java | 2 -- .../src/main/java/org/openapitools/client/model/Shape.java | 2 -- .../main/java/org/openapitools/client/model/ShapeOrNull.java | 2 -- .../src/main/java/org/openapitools/client/model/Triangle.java | 3 --- .../src/main/java/org/openapitools/client/model/Fruit.java | 2 -- .../src/main/java/org/openapitools/client/model/FruitReq.java | 2 -- .../src/main/java/org/openapitools/client/model/Mammal.java | 2 -- .../main/java/org/openapitools/client/model/NullableShape.java | 2 -- .../src/main/java/org/openapitools/client/model/Pig.java | 2 -- .../main/java/org/openapitools/client/model/Quadrilateral.java | 2 -- .../src/main/java/org/openapitools/client/model/Shape.java | 2 -- .../main/java/org/openapitools/client/model/ShapeOrNull.java | 2 -- .../src/main/java/org/openapitools/client/model/Triangle.java | 3 --- .../src/main/java/org/openapitools/client/model/Fruit.java | 2 -- .../src/main/java/org/openapitools/client/model/FruitReq.java | 2 -- .../src/main/java/org/openapitools/client/model/Mammal.java | 2 -- .../main/java/org/openapitools/client/model/NullableShape.java | 2 -- .../src/main/java/org/openapitools/client/model/Pig.java | 2 -- .../main/java/org/openapitools/client/model/Quadrilateral.java | 2 -- .../src/main/java/org/openapitools/client/model/Shape.java | 2 -- .../main/java/org/openapitools/client/model/ShapeOrNull.java | 2 -- .../src/main/java/org/openapitools/client/model/Triangle.java | 3 --- 28 files changed, 58 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/oneof_model.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/oneof_model.mustache index 7ae9af9a344d..1ecfc5679a64 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/native/oneof_model.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/oneof_model.mustache @@ -430,7 +430,6 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im {{/isPrimitiveType}} {{^isPrimitiveType}} {{#isModel}} - // 1 if (getActualInstance() != null) { joiner.add((({{{dataType}}})getActualInstance()).toUrlQueryString(prefix + "{{{baseName}}}" + suffix)); } diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Fruit.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Fruit.java index 512ead1a0f90..a98dfb19eb29 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Fruit.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Fruit.java @@ -280,14 +280,12 @@ 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)); } diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FruitReq.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FruitReq.java index 39cc8c11da4a..5fa27d10310a 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FruitReq.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FruitReq.java @@ -280,14 +280,12 @@ 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)); } diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Mammal.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Mammal.java index 8b078f74560c..7c8b1beb746a 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Mammal.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Mammal.java @@ -338,7 +338,6 @@ 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)); } @@ -351,7 +350,6 @@ 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)); } diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/NullableShape.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/NullableShape.java index 8e10f20e6cef..3f73d8989c20 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/NullableShape.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/NullableShape.java @@ -295,14 +295,12 @@ 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)); } diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Pig.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Pig.java index b44503460e4a..1f5a32d20e29 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Pig.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Pig.java @@ -288,14 +288,12 @@ 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)); } diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Quadrilateral.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Quadrilateral.java index ace8934207cd..3cb5ebf72acb 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Quadrilateral.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Quadrilateral.java @@ -288,14 +288,12 @@ 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)); } diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Shape.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Shape.java index c3b7d054fc28..c5ea5de434c8 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Shape.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Shape.java @@ -288,14 +288,12 @@ 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)); } diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ShapeOrNull.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ShapeOrNull.java index 4f27a2313f52..e61681144e56 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ShapeOrNull.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ShapeOrNull.java @@ -288,14 +288,12 @@ 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)); } diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Triangle.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Triangle.java index fe55240c10cf..8b1ac407fc56 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Triangle.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Triangle.java @@ -338,21 +338,18 @@ 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)); } diff --git a/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/Fruit.java b/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/Fruit.java index e1a4272f9576..945fe60ebc49 100644 --- a/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/Fruit.java +++ b/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/Fruit.java @@ -280,14 +280,12 @@ 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)); } diff --git a/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/FruitReq.java b/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/FruitReq.java index 2a72f63466c8..e54e3146cc66 100644 --- a/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/FruitReq.java +++ b/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/FruitReq.java @@ -280,14 +280,12 @@ 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)); } diff --git a/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/Mammal.java b/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/Mammal.java index 38c8adac8561..e0f0606cfe3d 100644 --- a/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/Mammal.java +++ b/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/Mammal.java @@ -338,7 +338,6 @@ 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)); } @@ -351,7 +350,6 @@ 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)); } diff --git a/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/NullableShape.java b/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/NullableShape.java index f1c73b3d9ce8..1164b325d1ad 100644 --- a/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/NullableShape.java +++ b/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/NullableShape.java @@ -294,14 +294,12 @@ 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)); } diff --git a/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/Pig.java b/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/Pig.java index ae1e98094ddd..74390454f43f 100644 --- a/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/Pig.java +++ b/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/Pig.java @@ -287,14 +287,12 @@ 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)); } diff --git a/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/Quadrilateral.java b/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/Quadrilateral.java index 3bc137b2546d..57ce6cb9cdc8 100644 --- a/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/Quadrilateral.java +++ b/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/Quadrilateral.java @@ -287,14 +287,12 @@ 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)); } diff --git a/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/Shape.java b/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/Shape.java index 9e1fbecb7a13..4454617f07dd 100644 --- a/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/Shape.java +++ b/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/Shape.java @@ -287,14 +287,12 @@ 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)); } diff --git a/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/ShapeOrNull.java b/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/ShapeOrNull.java index 18d3e2562811..5714e8bdb40a 100644 --- a/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/ShapeOrNull.java +++ b/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/ShapeOrNull.java @@ -287,14 +287,12 @@ 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)); } diff --git a/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/Triangle.java b/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/Triangle.java index a881fa83d5de..c994212ac01f 100644 --- a/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/Triangle.java +++ b/samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/Triangle.java @@ -337,21 +337,18 @@ 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)); } diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Fruit.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Fruit.java index 90a5352ebeb8..4e321df8d6c2 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Fruit.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Fruit.java @@ -282,14 +282,12 @@ 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)); } diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FruitReq.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FruitReq.java index d81bc8c9f855..8fad6c84cbee 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FruitReq.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FruitReq.java @@ -282,14 +282,12 @@ 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)); } diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Mammal.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Mammal.java index afb207663073..21980895e930 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Mammal.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Mammal.java @@ -340,7 +340,6 @@ 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)); } @@ -353,7 +352,6 @@ 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)); } diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/NullableShape.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/NullableShape.java index b2990479d743..0b48fcb9f0fd 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/NullableShape.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/NullableShape.java @@ -297,14 +297,12 @@ 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)); } diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Pig.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Pig.java index 33f94f98a409..d6b7944f7896 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Pig.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Pig.java @@ -290,14 +290,12 @@ 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)); } diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Quadrilateral.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Quadrilateral.java index 539d1e29098d..bb076cba5038 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Quadrilateral.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Quadrilateral.java @@ -290,14 +290,12 @@ 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)); } diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Shape.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Shape.java index 946b9036faed..bde023a14e04 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Shape.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Shape.java @@ -290,14 +290,12 @@ 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)); } diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ShapeOrNull.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ShapeOrNull.java index e00ac199872b..5592919b0850 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ShapeOrNull.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ShapeOrNull.java @@ -290,14 +290,12 @@ 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)); } diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Triangle.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Triangle.java index 27b7ca19249b..f4dea0e00330 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Triangle.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Triangle.java @@ -340,21 +340,18 @@ 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)); }