loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

[Java][native] Fix: empty deepObject can produce invalid query [fix #18736] (#18737)

Browse Source 
* fix empty query parameter string

* update samples
This commit is contained in:
Marcel Huber 2024-05-26 09:54:58 +02:00 committed by GitHub
parent 77365c34fa
commit 728abafdfa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/openapi-generator/src/main/resources/Java/libraries/native/api.mustache vendored
View File

@ -372,7 +372,10 @@ public class {{classname}} {
} }
{{/isArray}} {{/isArray}}
{{^isArray}} {{^isArray}}
localVarQueryStringJoiner.add({{paramName}}.toUrlQueryString("{{baseName}}")); String queryString = {{paramName}}.toUrlQueryString("{{baseName}}");
if (!queryString.isBlank()) {
localVarQueryStringJoiner.add(queryString);
}
{{/isArray}} {{/isArray}}
} }
{{/isDeepObject}} {{/isDeepObject}}

2
modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientDeepObjectTest.java
View File

@ -59,6 +59,6 @@ public class JavaClientDeepObjectTest {
assertFileContains(Paths.get(outputPath + "/src/main/java/org/openapitools/client/api/DefaultApi.java"), assertFileContains(Paths.get(outputPath + "/src/main/java/org/openapitools/client/api/DefaultApi.java"),
"options.toUrlQueryString(\"options\")", "options.toUrlQueryString(\"options\")",
"inputOptions.toUrlQueryString(\"inputOptions\"))"); "inputOptions.toUrlQueryString(\"inputOptions\")");
} }
} }

10
samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/QueryApi.java
View File

@ -453,7 +453,10 @@ public class QueryApi {
String localVarQueryParameterBaseName; String localVarQueryParameterBaseName;
localVarQueryParameterBaseName = "query_object"; localVarQueryParameterBaseName = "query_object";
if (queryObject != null) { if (queryObject != null) {
localVarQueryStringJoiner.add(queryObject.toUrlQueryString("query_object")); String queryString = queryObject.toUrlQueryString("query_object");
if (!queryString.isBlank()) {
localVarQueryStringJoiner.add(queryString);
}
} }
if (!localVarQueryParams.isEmpty() || localVarQueryStringJoiner.length() != 0) { if (!localVarQueryParams.isEmpty() || localVarQueryStringJoiner.length() != 0) {
@ -546,7 +549,10 @@ public class QueryApi {
String localVarQueryParameterBaseName; String localVarQueryParameterBaseName;
localVarQueryParameterBaseName = "query_object"; localVarQueryParameterBaseName = "query_object";
if (queryObject != null) { if (queryObject != null) {
localVarQueryStringJoiner.add(queryObject.toUrlQueryString("query_object")); String queryString = queryObject.toUrlQueryString("query_object");
if (!queryString.isBlank()) {
localVarQueryStringJoiner.add(queryString);
}
} }
if (!localVarQueryParams.isEmpty() || localVarQueryStringJoiner.length() != 0) { if (!localVarQueryParams.isEmpty() || localVarQueryStringJoiner.length() != 0) {