Skip to content

fix(java/restclient): avoid IndexOutOfBoundsException for empty multi… #23314

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 1 commit into from
Mar 23, 2026
Merged

fix(java/restclient): avoid IndexOutOfBoundsException for empty multi… #23314

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
14 changes: 7 additions & 7 deletions modules/openapi-generator/src/main/resources/Java/libraries/restclient/ApiClient.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -846,14 +846,14 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {

if (MediaType.MULTIPART_FORM_DATA.isCompatibleWith(contentType)) {
formParams.forEach(
(k, v) -> {
if (v instanceof java.util.ArrayList) {
Object o = v.get(0);
if (o != null && o.getClass().getEnumConstants() != null) {
v.set(0, o.toString());
}
(k, v) -> {
if (v instanceof java.util.ArrayList && !v.isEmpty()) {
Object first = v.get(0);
if (first != null && first.getClass().isEnum()) {
v.set(0, first.toString());
}
});
}
});
}

var selectedBody = selectBody(body, formParams, contentType);
Expand Down
26 changes: 26 additions & 0 deletions .../openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4211,4 +4211,30 @@ public void testFeignHc5CustomTemplateDirIsPreserved() {
"feign-hc5 must preserve a user-provided templateDir and not overwrite it with 'feign'");
}

@Test(description = "Regression test for multipart/form-data list handling in restclient ApiClient to avoid IndexOutOfBoundsException on empty lists")
public void testRestClientMultipartFormParamsGuardAgainstEmptyLists() {
final Path output = newTempFolder();
final CodegenConfigurator configurator = new CodegenConfigurator()
.setGeneratorName(JAVA_GENERATOR)
.setLibrary(JavaClientCodegen.RESTCLIENT)
.setAdditionalProperties(Map.of(CodegenConstants.API_PACKAGE, "xyz.abcdef.api"))
.setInputSpec("src/test/resources/3_0/form-multipart-binary-array.yaml")
.setOutputDir(output.toString().replace("\\", "/"));

List<File> files = new DefaultGenerator().opts(configurator.toClientOptInput()).generate();

validateJavaSourceFiles(files);

assertFileContains(
output.resolve("src/main/java/xyz/abcdef/ApiClient.java"),
"if (v instanceof java.util.ArrayList && !v.isEmpty()) {",
"first.getClass().isEnum()"
);

TestUtils.assertFileNotContains(
output.resolve("src/main/java/xyz/abcdef/ApiClient.java"),
"if (v instanceof java.util.ArrayList) {",
"o.getClass().getEnumConstants() != null"
);
}
}
14 changes: 7 additions & 7 deletions samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/ApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -724,14 +724,14 @@ protected RestClient.RequestBodySpec prepareRequest(String path, HttpMethod meth

if (MediaType.MULTIPART_FORM_DATA.isCompatibleWith(contentType)) {
formParams.forEach(
(k, v) -> {
if (v instanceof java.util.ArrayList) {
Object o = v.get(0);
if (o != null && o.getClass().getEnumConstants() != null) {
v.set(0, o.toString());
}
(k, v) -> {
if (v instanceof java.util.ArrayList && !v.isEmpty()) {
Object first = v.get(0);
if (first != null && first.getClass().isEnum()) {
v.set(0, first.toString());
}
});
}
});
}

var selectedBody = selectBody(body, formParams, contentType);
Expand Down
14 changes: 7 additions & 7 deletions ...rs/java/restclient-enum-in-multipart/src/main/java/org/openapitools/client/ApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -723,14 +723,14 @@ protected RestClient.RequestBodySpec prepareRequest(String path, HttpMethod meth

if (MediaType.MULTIPART_FORM_DATA.isCompatibleWith(contentType)) {
formParams.forEach(
(k, v) -> {
if (v instanceof java.util.ArrayList) {
Object o = v.get(0);
if (o != null && o.getClass().getEnumConstants() != null) {
v.set(0, o.toString());
}
(k, v) -> {
if (v instanceof java.util.ArrayList && !v.isEmpty()) {
Object first = v.get(0);
if (first != null && first.getClass().isEnum()) {
v.set(0, first.toString());
}
});
}
});
}

var selectedBody = selectBody(body, formParams, contentType);
Expand Down
14 changes: 7 additions & 7 deletions ...hers/java/restclient-sealedInterface/src/main/java/org/openapitools/client/ApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -722,14 +722,14 @@ protected RestClient.RequestBodySpec prepareRequest(String path, HttpMethod meth

if (MediaType.MULTIPART_FORM_DATA.isCompatibleWith(contentType)) {
formParams.forEach(
(k, v) -> {
if (v instanceof java.util.ArrayList) {
Object o = v.get(0);
if (o != null && o.getClass().getEnumConstants() != null) {
v.set(0, o.toString());
}
(k, v) -> {
if (v instanceof java.util.ArrayList && !v.isEmpty()) {
Object first = v.get(0);
if (first != null && first.getClass().isEnum()) {
v.set(0, first.toString());
}
});
}
});
}

var selectedBody = selectBody(body, formParams, contentType);
Expand Down
14 changes: 7 additions & 7 deletions ...va/restclient-useAbstractionForFiles/src/main/java/org/openapitools/client/ApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -722,14 +722,14 @@ protected RestClient.RequestBodySpec prepareRequest(String path, HttpMethod meth

if (MediaType.MULTIPART_FORM_DATA.isCompatibleWith(contentType)) {
formParams.forEach(
(k, v) -> {
if (v instanceof java.util.ArrayList) {
Object o = v.get(0);
if (o != null && o.getClass().getEnumConstants() != null) {
v.set(0, o.toString());
}
(k, v) -> {
if (v instanceof java.util.ArrayList && !v.isEmpty()) {
Object first = v.get(0);
if (first != null && first.getClass().isEnum()) {
v.set(0, first.toString());
}
});
}
});
}

var selectedBody = selectBody(body, formParams, contentType);
Expand Down
14 changes: 7 additions & 7 deletions ...tore/java/restclient-nullable-arrays/src/main/java/org/openapitools/client/ApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -722,14 +722,14 @@ protected RestClient.RequestBodySpec prepareRequest(String path, HttpMethod meth

if (MediaType.MULTIPART_FORM_DATA.isCompatibleWith(contentType)) {
formParams.forEach(
(k, v) -> {
if (v instanceof java.util.ArrayList) {
Object o = v.get(0);
if (o != null && o.getClass().getEnumConstants() != null) {
v.set(0, o.toString());
}
(k, v) -> {
if (v instanceof java.util.ArrayList && !v.isEmpty()) {
Object first = v.get(0);
if (first != null && first.getClass().isEnum()) {
v.set(0, first.toString());
}
});
}
});
}

var selectedBody = selectBody(body, formParams, contentType);
Expand Down
14 changes: 7 additions & 7 deletions ...java/restclient-springBoot4-jackson2/src/main/java/org/openapitools/client/ApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -748,14 +748,14 @@ protected RestClient.RequestBodySpec prepareRequest(String path, HttpMethod meth

if (MediaType.MULTIPART_FORM_DATA.isCompatibleWith(contentType)) {
formParams.forEach(
(k, v) -> {
if (v instanceof java.util.ArrayList) {
Object o = v.get(0);
if (o != null && o.getClass().getEnumConstants() != null) {
v.set(0, o.toString());
}
(k, v) -> {
if (v instanceof java.util.ArrayList && !v.isEmpty()) {
Object first = v.get(0);
if (first != null && first.getClass().isEnum()) {
v.set(0, first.toString());
}
});
}
});
}

var selectedBody = selectBody(body, formParams, contentType);
Expand Down
14 changes: 7 additions & 7 deletions ...java/restclient-springBoot4-jackson3/src/main/java/org/openapitools/client/ApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -741,14 +741,14 @@ protected RestClient.RequestBodySpec prepareRequest(String path, HttpMethod meth

if (MediaType.MULTIPART_FORM_DATA.isCompatibleWith(contentType)) {
formParams.forEach(
(k, v) -> {
if (v instanceof java.util.ArrayList) {
Object o = v.get(0);
if (o != null && o.getClass().getEnumConstants() != null) {
v.set(0, o.toString());
}
(k, v) -> {
if (v instanceof java.util.ArrayList && !v.isEmpty()) {
Object first = v.get(0);
if (first != null && first.getClass().isEnum()) {
v.set(0, first.toString());
}
});
}
});
}

var selectedBody = selectBody(body, formParams, contentType);
Expand Down
14 changes: 7 additions & 7 deletions ...nt/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/ApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -795,14 +795,14 @@ protected RestClient.RequestBodySpec prepareRequest(String path, HttpMethod meth

if (MediaType.MULTIPART_FORM_DATA.isCompatibleWith(contentType)) {
formParams.forEach(
(k, v) -> {
if (v instanceof java.util.ArrayList) {
Object o = v.get(0);
if (o != null && o.getClass().getEnumConstants() != null) {
v.set(0, o.toString());
}
(k, v) -> {
if (v instanceof java.util.ArrayList && !v.isEmpty()) {
Object first = v.get(0);
if (first != null && first.getClass().isEnum()) {
v.set(0, first.toString());
}
});
}
});
}

var selectedBody = selectBody(body, formParams, contentType);
Expand Down
14 changes: 7 additions & 7 deletions ...ent-useSingleRequestParameter-static/src/main/java/org/openapitools/client/ApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -795,14 +795,14 @@ protected RestClient.RequestBodySpec prepareRequest(String path, HttpMethod meth

if (MediaType.MULTIPART_FORM_DATA.isCompatibleWith(contentType)) {
formParams.forEach(
(k, v) -> {
if (v instanceof java.util.ArrayList) {
Object o = v.get(0);
if (o != null && o.getClass().getEnumConstants() != null) {
v.set(0, o.toString());
}
(k, v) -> {
if (v instanceof java.util.ArrayList && !v.isEmpty()) {
Object first = v.get(0);
if (first != null && first.getClass().isEnum()) {
v.set(0, first.toString());
}
});
}
});
}

var selectedBody = selectBody(body, formParams, contentType);
Expand Down
14 changes: 7 additions & 7 deletions ...restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/ApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -795,14 +795,14 @@ protected RestClient.RequestBodySpec prepareRequest(String path, HttpMethod meth

if (MediaType.MULTIPART_FORM_DATA.isCompatibleWith(contentType)) {
formParams.forEach(
(k, v) -> {
if (v instanceof java.util.ArrayList) {
Object o = v.get(0);
if (o != null && o.getClass().getEnumConstants() != null) {
v.set(0, o.toString());
}
(k, v) -> {
if (v instanceof java.util.ArrayList && !v.isEmpty()) {
Object first = v.get(0);
if (first != null && first.getClass().isEnum()) {
v.set(0, first.toString());
}
});
}
});
}

var selectedBody = selectBody(body, formParams, contentType);
Expand Down
14 changes: 7 additions & 7 deletions samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/ApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -795,14 +795,14 @@ protected RestClient.RequestBodySpec prepareRequest(String path, HttpMethod meth

if (MediaType.MULTIPART_FORM_DATA.isCompatibleWith(contentType)) {
formParams.forEach(
(k, v) -> {
if (v instanceof java.util.ArrayList) {
Object o = v.get(0);
if (o != null && o.getClass().getEnumConstants() != null) {
v.set(0, o.toString());
}
(k, v) -> {
if (v instanceof java.util.ArrayList && !v.isEmpty()) {
Object first = v.get(0);
if (first != null && first.getClass().isEnum()) {
v.set(0, first.toString());
}
});
}
});
}

var selectedBody = selectBody(body, formParams, contentType);
Expand Down
Loading