Skip to content

Commit b929970

Browse files
authored
fix: #21329 Java Native, Provide Null Check before toString on param variables (#21330)
* fix: #21329 Java Native, Provide Null Check before toString on param variables * #21329 - Samples Generated
1 parent 18ccf86 commit b929970

File tree

5 files changed

+24
-8
lines changed
  • modules/openapi-generator/src/main/resources/Java/libraries/native
  • samples/client
    • echo_api/java/native/src/main/java/org/openapitools/client/api
    • petstore/java
      • native/src/main/java/org/openapitools/client/api
      • native-async/src/main/java/org/openapitools/client/api
      • native-jakarta/src/main/java/org/openapitools/client/api

5 files changed

+24
-8
lines changed

modules/openapi-generator/src/main/resources/Java/libraries/native/api.mustache

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,9 @@ public class {{classname}} {
484484
hasFiles = true;
485485
{{/isFile}}
486486
{{^isFile}}
487-
multiPartBuilder.addTextBody("{{{baseName}}}", {{paramName}}.get(i).toString());
487+
if ({{paramName}}.get(i) != null) {
488+
multiPartBuilder.addTextBody("{{{baseName}}}", {{paramName}}.get(i).toString());
489+
}
488490
{{/isFile}}
489491
}
490492
{{/isArray}}
@@ -494,7 +496,9 @@ public class {{classname}} {
494496
hasFiles = true;
495497
{{/isFile}}
496498
{{^isFile}}
497-
multiPartBuilder.addTextBody("{{{baseName}}}", {{paramName}}.toString());
499+
if ({{paramName}} != null) {
500+
multiPartBuilder.addTextBody("{{{baseName}}}", {{paramName}}.toString());
501+
}
498502
{{/isFile}}
499503
{{/isArray}}
500504
{{/formParams}}

samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/FormApi.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,9 @@ private HttpRequest.Builder testFormObjectMultipartRequestBuilder(@javax.annotat
260260

261261
MultipartEntityBuilder multiPartBuilder = MultipartEntityBuilder.create();
262262
boolean hasFiles = false;
263-
multiPartBuilder.addTextBody("marker", marker.toString());
263+
if (marker != null) {
264+
multiPartBuilder.addTextBody("marker", marker.toString());
265+
}
264266
HttpEntity entity = multiPartBuilder.build();
265267
HttpRequest.BodyPublisher formDataPublisher;
266268
if (hasFiles) {

samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/PetApi.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -847,7 +847,9 @@ private HttpRequest.Builder uploadFileRequestBuilder(@javax.annotation.Nonnull L
847847

848848
MultipartEntityBuilder multiPartBuilder = MultipartEntityBuilder.create();
849849
boolean hasFiles = false;
850-
multiPartBuilder.addTextBody("additionalMetadata", additionalMetadata.toString());
850+
if (additionalMetadata != null) {
851+
multiPartBuilder.addTextBody("additionalMetadata", additionalMetadata.toString());
852+
}
851853
multiPartBuilder.addBinaryBody("file", _file);
852854
hasFiles = true;
853855
HttpEntity entity = multiPartBuilder.build();
@@ -983,7 +985,9 @@ private HttpRequest.Builder uploadFileWithRequiredFileRequestBuilder(@javax.anno
983985

984986
MultipartEntityBuilder multiPartBuilder = MultipartEntityBuilder.create();
985987
boolean hasFiles = false;
986-
multiPartBuilder.addTextBody("additionalMetadata", additionalMetadata.toString());
988+
if (additionalMetadata != null) {
989+
multiPartBuilder.addTextBody("additionalMetadata", additionalMetadata.toString());
990+
}
987991
multiPartBuilder.addBinaryBody("requiredFile", requiredFile);
988992
hasFiles = true;
989993
HttpEntity entity = multiPartBuilder.build();

samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/api/PetApi.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -814,7 +814,9 @@ private HttpRequest.Builder uploadFileRequestBuilder(@jakarta.annotation.Nonnull
814814

815815
MultipartEntityBuilder multiPartBuilder = MultipartEntityBuilder.create();
816816
boolean hasFiles = false;
817-
multiPartBuilder.addTextBody("additionalMetadata", additionalMetadata.toString());
817+
if (additionalMetadata != null) {
818+
multiPartBuilder.addTextBody("additionalMetadata", additionalMetadata.toString());
819+
}
818820
multiPartBuilder.addBinaryBody("file", _file);
819821
hasFiles = true;
820822
HttpEntity entity = multiPartBuilder.build();

samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/PetApi.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -794,7 +794,9 @@ private HttpRequest.Builder uploadFileRequestBuilder(@javax.annotation.Nonnull L
794794

795795
MultipartEntityBuilder multiPartBuilder = MultipartEntityBuilder.create();
796796
boolean hasFiles = false;
797-
multiPartBuilder.addTextBody("additionalMetadata", additionalMetadata.toString());
797+
if (additionalMetadata != null) {
798+
multiPartBuilder.addTextBody("additionalMetadata", additionalMetadata.toString());
799+
}
798800
multiPartBuilder.addBinaryBody("file", _file);
799801
hasFiles = true;
800802
HttpEntity entity = multiPartBuilder.build();
@@ -920,7 +922,9 @@ private HttpRequest.Builder uploadFileWithRequiredFileRequestBuilder(@javax.anno
920922

921923
MultipartEntityBuilder multiPartBuilder = MultipartEntityBuilder.create();
922924
boolean hasFiles = false;
923-
multiPartBuilder.addTextBody("additionalMetadata", additionalMetadata.toString());
925+
if (additionalMetadata != null) {
926+
multiPartBuilder.addTextBody("additionalMetadata", additionalMetadata.toString());
927+
}
924928
multiPartBuilder.addBinaryBody("requiredFile", requiredFile);
925929
hasFiles = true;
926930
HttpEntity entity = multiPartBuilder.build();

0 commit comments

Comments
 (0)