Skip to content

fix: #21329 Java Native, Provide Null Check before toString on param variables #21330

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 2 commits into from
Jun 2, 2025
Merged

fix: #21329 Java Native, Provide Null Check before toString on param variables #21330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8cec51f
fix: #21329 Java Native, Provide Null Check before toString on param …
duttonw May 26, 2025
0d95e00
#21329 - Samples Generated
duttonw May 26, 2025
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
8 changes: 6 additions & 2 deletions modules/openapi-generator/src/main/resources/Java/libraries/native/api.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,9 @@ public class {{classname}} {
hasFiles = true;
{{/isFile}}
{{^isFile}}
multiPartBuilder.addTextBody("{{{baseName}}}", {{paramName}}.get(i).toString());
if ({{paramName}}.get(i) != null) {
multiPartBuilder.addTextBody("{{{baseName}}}", {{paramName}}.get(i).toString());
}
{{/isFile}}
}
{{/isArray}}
Expand All @@ -494,7 +496,9 @@ public class {{classname}} {
hasFiles = true;
{{/isFile}}
{{^isFile}}
multiPartBuilder.addTextBody("{{{baseName}}}", {{paramName}}.toString());
if ({{paramName}} != null) {
multiPartBuilder.addTextBody("{{{baseName}}}", {{paramName}}.toString());
}
{{/isFile}}
{{/isArray}}
{{/formParams}}
Expand Down
4 changes: 3 additions & 1 deletion samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/FormApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,9 @@ private HttpRequest.Builder testFormObjectMultipartRequestBuilder(@javax.annotat

MultipartEntityBuilder multiPartBuilder = MultipartEntityBuilder.create();
boolean hasFiles = false;
multiPartBuilder.addTextBody("marker", marker.toString());
if (marker != null) {
multiPartBuilder.addTextBody("marker", marker.toString());
}
HttpEntity entity = multiPartBuilder.build();
HttpRequest.BodyPublisher formDataPublisher;
if (hasFiles) {
Expand Down
8 changes: 6 additions & 2 deletions ...s/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/PetApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -847,7 +847,9 @@ private HttpRequest.Builder uploadFileRequestBuilder(@javax.annotation.Nonnull L

MultipartEntityBuilder multiPartBuilder = MultipartEntityBuilder.create();
boolean hasFiles = false;
multiPartBuilder.addTextBody("additionalMetadata", additionalMetadata.toString());
if (additionalMetadata != null) {
multiPartBuilder.addTextBody("additionalMetadata", additionalMetadata.toString());
}
multiPartBuilder.addBinaryBody("file", _file);
hasFiles = true;
HttpEntity entity = multiPartBuilder.build();
Expand Down Expand Up @@ -983,7 +985,9 @@ private HttpRequest.Builder uploadFileWithRequiredFileRequestBuilder(@javax.anno

MultipartEntityBuilder multiPartBuilder = MultipartEntityBuilder.create();
boolean hasFiles = false;
multiPartBuilder.addTextBody("additionalMetadata", additionalMetadata.toString());
if (additionalMetadata != null) {
multiPartBuilder.addTextBody("additionalMetadata", additionalMetadata.toString());
}
multiPartBuilder.addBinaryBody("requiredFile", requiredFile);
hasFiles = true;
HttpEntity entity = multiPartBuilder.build();
Expand Down
4 changes: 3 additions & 1 deletion ...client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/api/PetApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -814,7 +814,9 @@ private HttpRequest.Builder uploadFileRequestBuilder(@jakarta.annotation.Nonnull

MultipartEntityBuilder multiPartBuilder = MultipartEntityBuilder.create();
boolean hasFiles = false;
multiPartBuilder.addTextBody("additionalMetadata", additionalMetadata.toString());
if (additionalMetadata != null) {
multiPartBuilder.addTextBody("additionalMetadata", additionalMetadata.toString());
}
multiPartBuilder.addBinaryBody("file", _file);
hasFiles = true;
HttpEntity entity = multiPartBuilder.build();
Expand Down
8 changes: 6 additions & 2 deletions samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/PetApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -794,7 +794,9 @@ private HttpRequest.Builder uploadFileRequestBuilder(@javax.annotation.Nonnull L

MultipartEntityBuilder multiPartBuilder = MultipartEntityBuilder.create();
boolean hasFiles = false;
multiPartBuilder.addTextBody("additionalMetadata", additionalMetadata.toString());
if (additionalMetadata != null) {
multiPartBuilder.addTextBody("additionalMetadata", additionalMetadata.toString());
}
multiPartBuilder.addBinaryBody("file", _file);
hasFiles = true;
HttpEntity entity = multiPartBuilder.build();
Expand Down Expand Up @@ -920,7 +922,9 @@ private HttpRequest.Builder uploadFileWithRequiredFileRequestBuilder(@javax.anno

MultipartEntityBuilder multiPartBuilder = MultipartEntityBuilder.create();
boolean hasFiles = false;
multiPartBuilder.addTextBody("additionalMetadata", additionalMetadata.toString());
if (additionalMetadata != null) {
multiPartBuilder.addTextBody("additionalMetadata", additionalMetadata.toString());
}
multiPartBuilder.addBinaryBody("requiredFile", requiredFile);
hasFiles = true;
HttpEntity entity = multiPartBuilder.build();
Expand Down
Loading