Skip to content

Type check of array element only when array is not empty. fix #21276 #21571

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
merged 1 commit into from
Jul 16, 2025
+17 −17
Merged

Type check of array element only when array is not empty. fix #21276 #21571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/anyof_model.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
{{^isPrimitiveType}}
{{#isArray}}
List<?> list = (List<?>) value.getActualInstance();
if (list.get(0) instanceof {{{items.dataType}}}) {
if (!list.isEmpty() && list.get(0) instanceof {{{items.dataType}}}) {
JsonArray array = adapter{{#sanitizeDataType}}{{{dataType}}}{{/sanitizeDataType}}.toJsonTree(({{{dataType}}})value.getActualInstance()).getAsJsonArray();
elementAdapter.write(out, array);
return;
Expand Down Expand Up @@ -252,7 +252,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
if (instance instanceof {{#isArray}}List<?>{{/isArray}}{{^isArray}}{{{dataType}}}{{/isArray}}) {
{{#isArray}}
List<?> list = (List<?>) instance;
if (list.get(0) instanceof {{{items.dataType}}}) {
if (!list.isEmpty() && list.get(0) instanceof {{{items.dataType}}}) {
super.setActualInstance(instance);
return;
}
Expand Down
4 changes: 2 additions & 2 deletions modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/oneof_model.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
{{^isPrimitiveType}}
{{#isArray}}
List<?> list = (List<?>) value.getActualInstance();
if (list.get(0) instanceof {{{items.dataType}}}) {
if (!list.isEmpty() && list.get(0) instanceof {{{items.dataType}}}) {
JsonArray array = adapter{{#sanitizeDataType}}{{{dataType}}}{{/sanitizeDataType}}.toJsonTree(({{{dataType}}})value.getActualInstance()).getAsJsonArray();
elementAdapter.write(out, array);
return;
Expand Down Expand Up @@ -330,7 +330,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
if (instance instanceof {{#isArray}}List<?>{{/isArray}}{{#isMap}}Map<?, ?>{{/isMap}}{{^isMap}}{{^isArray}}{{{dataType}}}{{/isArray}}{{/isMap}}) {
{{#isArray}}
List<?> list = (List<?>) instance;
if (list.get(0) instanceof {{{items.dataType}}}) {
if (!list.isEmpty() && list.get(0) instanceof {{{items.dataType}}}) {
super.setActualInstance(instance);
return;
}
Expand Down
2 changes: 1 addition & 1 deletion modules/openapi-generator/src/main/resources/kotlin-client/anyof_class.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ import java.io.IOException
if (value.actualInstance is {{#isArray}}List<*>{{/isArray}}{{^isArray}}{{{dataType}}}{{/isArray}}) {
{{#isArray}}
val list = value.actualInstance as List<Any>
if (list.get(0) is {{{items.dataType}}}) {
if (!list.isEmpty() && list.get(0) is {{{items.dataType}}}) {
val array = adapter{{#sanitizeGeneric}}{{{dataType}}}{{/sanitizeGeneric}}.toJsonTree(value.actualInstance as {{{dataType}}}?).getAsJsonArray()
elementAdapter.write(out, array)
return
Expand Down
2 changes: 1 addition & 1 deletion modules/openapi-generator/src/main/resources/kotlin-client/oneof_class.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ import java.io.IOException
if (value.actualInstance is {{#isArray}}List<*>{{/isArray}}{{^isArray}}{{{dataType}}}{{/isArray}}) {
{{#isArray}}
val list = value.actualInstance as List<Any>
if (list.get(0) is {{{items.dataType}}}) {
if (!list.isEmpty() && list.get(0) is {{{items.dataType}}}) {
val array = adapter{{#sanitizeGeneric}}{{{dataType}}}{{/sanitizeGeneric}}.toJsonTree(value.actualInstance as {{{dataType}}}?).getAsJsonArray()
elementAdapter.write(out, array)
return
Expand Down
4 changes: 2 additions & 2 deletions ...gson-oneOf-array/src/main/java/org/openapitools/client/model/MyExampleGet200Response.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public void write(JsonWriter out, MyExampleGet200Response value) throws IOExcept
// check if the actual instance is of the type `List<@Valid OneOf1>`
if (value.getActualInstance() instanceof List<?>) {
List<?> list = (List<?>) value.getActualInstance();
if (list.get(0) instanceof OneOf1) {
if (!list.isEmpty() && list.get(0) instanceof OneOf1) {
JsonArray array = adapterListOneOf1.toJsonTree((List<@Valid OneOf1>)value.getActualInstance()).getAsJsonArray();
elementAdapter.write(out, array);
return;
Expand Down Expand Up @@ -191,7 +191,7 @@ public Map<String, Class<?>> getSchemas() {
public void setActualInstance(Object instance) {
if (instance instanceof List<?>) {
List<?> list = (List<?>) instance;
if (list.get(0) instanceof OneOf1) {
if (!list.isEmpty() && list.get(0) instanceof OneOf1) {
super.setActualInstance(instance);
return;
}
Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/java/org/openapitools/client/model/RefToRefParameterAnyofRefToAnyofParameter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ public void setActualInstance(Object instance) {

if (instance instanceof List<?>) {
List<?> list = (List<?>) instance;
if (list.get(0) instanceof String) {
if (!list.isEmpty() && list.get(0) instanceof String) {
super.setActualInstance(instance);
return;
}
Expand Down
2 changes: 1 addition & 1 deletion ...ent/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayAnyOf.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ public void setActualInstance(Object instance) {

if (instance instanceof List<?>) {
List<?> list = (List<?>) instance;
if (list.get(0) instanceof String) {
if (!list.isEmpty() && list.get(0) instanceof String) {
super.setActualInstance(instance);
return;
}
Expand Down
2 changes: 1 addition & 1 deletion ...ent/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOneOf.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ public void setActualInstance(Object instance) {

if (instance instanceof List<?>) {
List<?> list = (List<?>) instance;
if (list.get(0) instanceof String) {
if (!list.isEmpty() && list.get(0) instanceof String) {
super.setActualInstance(instance);
return;
}
Expand Down
2 changes: 1 addition & 1 deletion ...n/src/main/java/org/openapitools/client/model/FakeAnyOfWIthSameErasureGet200Response.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ public Map<String, Class<?>> getSchemas() {
public void setActualInstance(Object instance) {
if (instance instanceof List<?>) {
List<?> list = (List<?>) instance;
if (list.get(0) instanceof String) {
if (!list.isEmpty() && list.get(0) instanceof String) {
super.setActualInstance(instance);
return;
}
Expand Down
2 changes: 1 addition & 1 deletion ...n/src/main/java/org/openapitools/client/model/FakeOneOfWIthSameErasureGet200Response.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ public Map<String, Class<?>> getSchemas() {
public void setActualInstance(Object instance) {
if (instance instanceof List<?>) {
List<?> list = (List<?>) instance;
if (list.get(0) instanceof String) {
if (!list.isEmpty() && list.get(0) instanceof String) {
super.setActualInstance(instance);
return;
}
Expand Down
4 changes: 2 additions & 2 deletions ...s/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Value.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public void write(JsonWriter out, Value value) throws IOException {
// check if the actual instance is of the type `List<Scalar>`
if (value.getActualInstance() instanceof List<?>) {
List<?> list = (List<?>) value.getActualInstance();
if (list.get(0) instanceof Scalar) {
if (!list.isEmpty() && list.get(0) instanceof Scalar) {
JsonArray array = adapterListScalar.toJsonTree((List<Scalar>)value.getActualInstance()).getAsJsonArray();
elementAdapter.write(out, array);
return;
Expand Down Expand Up @@ -187,7 +187,7 @@ public void setActualInstance(Object instance) {

if (instance instanceof List<?>) {
List<?> list = (List<?>) instance;
if (list.get(0) instanceof Scalar) {
if (!list.isEmpty() && list.get(0) instanceof Scalar) {
super.setActualInstance(instance);
return;
}
Expand Down
2 changes: 1 addition & 1 deletion ...mappings/src/main/kotlin/org/openapitools/client/models/ApiAnyOfUserOrPetOrArrayString.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ data class ApiAnyOfUserOrPetOrArrayString(var actualInstance: Any? = null) {
// check if the actual instance is of the type `kotlin.collections.List<kotlin.String>`
if (value.actualInstance is List<*>) {
val list = value.actualInstance as List<Any>
if (list.get(0) is kotlin.String) {
if (!list.isEmpty() && list.get(0) is kotlin.String) {
val array = adapterkotlincollectionsListkotlinString.toJsonTree(value.actualInstance as kotlin.collections.List<kotlin.String>?).getAsJsonArray()
elementAdapter.write(out, array)
return
Expand Down
2 changes: 1 addition & 1 deletion ...type-mappings/src/main/kotlin/org/openapitools/client/models/ApiUserOrPetOrArrayString.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ data class ApiUserOrPetOrArrayString(var actualInstance: Any? = null) {
// check if the actual instance is of the type `kotlin.collections.List<kotlin.String>`
if (value.actualInstance is List<*>) {
val list = value.actualInstance as List<Any>
if (list.get(0) is kotlin.String) {
if (!list.isEmpty() && list.get(0) is kotlin.String) {
val array = adapterkotlincollectionsListkotlinString.toJsonTree(value.actualInstance as kotlin.collections.List<kotlin.String>?).getAsJsonArray()
elementAdapter.write(out, array)
return
Expand Down
Loading