Skip to content

[BUG][java][restclient] Fix NPE when query param with value null is exploded #23505

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
Apr 10, 2026
Merged

[BUG][java][restclient] Fix NPE when query param with value null is exploded #23505

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: 3 additions & 1 deletion modules/openapi-generator/src/main/resources/Java/libraries/restclient/api.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,11 @@ public class {{classname}} {
{{^queryIsJsonMimeType}}
{{#isExplode}}
{{#hasVars}}
if ({{paramName}} != null) {
{{#vars}}
queryParams.putAll(apiClient.parameterToMultiValueMap({{#collectionFormat}}ApiClient.CollectionFormat.valueOf("{{{.}}}".toUpperCase(Locale.ROOT)){{/collectionFormat}}{{^collectionFormat}}null{{/collectionFormat}}, "{{baseName}}", {{paramName}}.{{getter}}()));
queryParams.putAll(apiClient.parameterToMultiValueMap({{#collectionFormat}}ApiClient.CollectionFormat.valueOf("{{{.}}}".toUpperCase(Locale.ROOT)){{/collectionFormat}}{{^collectionFormat}}null{{/collectionFormat}}, "{{baseName}}", {{paramName}}.{{getter}}()));
{{/vars}}
}
{{/hasVars}}
{{^hasVars}}
queryParams.putAll(apiClient.parameterToMultiValueMap({{#collectionFormat}}ApiClient.CollectionFormat.valueOf("{{{.}}}".toUpperCase(Locale.ROOT)){{/collectionFormat}}{{^collectionFormat}}null{{/collectionFormat}}, "{{baseName}}", {{paramName}}));
Expand Down
16 changes: 16 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 @@ -2642,6 +2642,22 @@ public void testQueryParamsExploded_whenQueryParamIsNull() {
assertFileContains(output.resolve("src/main/java/xyz/abcdef/api/DepartmentApi.java"), "if (filter != null) {");
}

@Test
public void testQueryParamsExploded_whenQueryParamIsNull_restclient() {
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/issue_17555.yaml")
.setOutputDir(output.toString().replace("\\", "/"));

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

validateJavaSourceFiles(files);
assertFileContains(output.resolve("src/main/java/xyz/abcdef/api/DepartmentApi.java"), "if (filter != null) {");
}

@Test
public void generateAllArgsConstructor() {
Map<String, File> files = generateFromContract("src/test/resources/3_0/java/all_args_constructor.yaml", JavaClientCodegen.RESTTEMPLATE,
Expand Down
32 changes: 19 additions & 13 deletions ...s/client/echo_api/java/restclient/src/main/java/org/openapitools/client/api/QueryApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,12 +306,14 @@ private ResponseSpec testQueryStyleDeepObjectExplodeTrueObjectRequestCreation(@j
final MultiValueMap<String, String> cookieParams = new LinkedMultiValueMap<>();
final MultiValueMap<String, Object> formParams = new LinkedMultiValueMap<>();

queryParams.putAll(apiClient.parameterToMultiValueMap(null, "id", queryObject.getId()));
queryParams.putAll(apiClient.parameterToMultiValueMap(null, "name", queryObject.getName()));
queryParams.putAll(apiClient.parameterToMultiValueMap(null, "category", queryObject.getCategory()));
queryParams.putAll(apiClient.parameterToMultiValueMap(null, "photoUrls", queryObject.getPhotoUrls()));
queryParams.putAll(apiClient.parameterToMultiValueMap(null, "tags", queryObject.getTags()));
queryParams.putAll(apiClient.parameterToMultiValueMap(null, "status", queryObject.getStatus()));
if (queryObject != null) {
queryParams.putAll(apiClient.parameterToMultiValueMap(null, "id", queryObject.getId()));
queryParams.putAll(apiClient.parameterToMultiValueMap(null, "name", queryObject.getName()));
queryParams.putAll(apiClient.parameterToMultiValueMap(null, "category", queryObject.getCategory()));
queryParams.putAll(apiClient.parameterToMultiValueMap(null, "photoUrls", queryObject.getPhotoUrls()));
queryParams.putAll(apiClient.parameterToMultiValueMap(null, "tags", queryObject.getTags()));
queryParams.putAll(apiClient.parameterToMultiValueMap(null, "status", queryObject.getStatus()));
}

final String[] localVarAccepts = {
"text/plain"
Expand Down Expand Up @@ -595,7 +597,9 @@ private ResponseSpec testQueryStyleFormExplodeTrueArrayStringRequestCreation(@ja
final MultiValueMap<String, String> cookieParams = new LinkedMultiValueMap<>();
final MultiValueMap<String, Object> formParams = new LinkedMultiValueMap<>();

queryParams.putAll(apiClient.parameterToMultiValueMap(null, "values", queryObject.getValues()));
if (queryObject != null) {
queryParams.putAll(apiClient.parameterToMultiValueMap(null, "values", queryObject.getValues()));
}

final String[] localVarAccepts = {
"text/plain"
Expand Down Expand Up @@ -666,12 +670,14 @@ private ResponseSpec testQueryStyleFormExplodeTrueObjectRequestCreation(@jakarta
final MultiValueMap<String, String> cookieParams = new LinkedMultiValueMap<>();
final MultiValueMap<String, Object> formParams = new LinkedMultiValueMap<>();

queryParams.putAll(apiClient.parameterToMultiValueMap(null, "id", queryObject.getId()));
queryParams.putAll(apiClient.parameterToMultiValueMap(null, "name", queryObject.getName()));
queryParams.putAll(apiClient.parameterToMultiValueMap(null, "category", queryObject.getCategory()));
queryParams.putAll(apiClient.parameterToMultiValueMap(null, "photoUrls", queryObject.getPhotoUrls()));
queryParams.putAll(apiClient.parameterToMultiValueMap(null, "tags", queryObject.getTags()));
queryParams.putAll(apiClient.parameterToMultiValueMap(null, "status", queryObject.getStatus()));
if (queryObject != null) {
queryParams.putAll(apiClient.parameterToMultiValueMap(null, "id", queryObject.getId()));
queryParams.putAll(apiClient.parameterToMultiValueMap(null, "name", queryObject.getName()));
queryParams.putAll(apiClient.parameterToMultiValueMap(null, "category", queryObject.getCategory()));
queryParams.putAll(apiClient.parameterToMultiValueMap(null, "photoUrls", queryObject.getPhotoUrls()));
queryParams.putAll(apiClient.parameterToMultiValueMap(null, "tags", queryObject.getTags()));
queryParams.putAll(apiClient.parameterToMultiValueMap(null, "status", queryObject.getStatus()));
}

final String[] localVarAccepts = {
"text/plain"
Expand Down
Loading