Skip to content

Commit 9e0db35

Browse files
committed
#755 fixed query parameters with empty map issue
1 parent 409369b commit 9e0db35

File tree

1 file changed

+15
-8
lines changed

1 file changed

+15
-8
lines changed

src/main/resources/handlebars/swift5/api.mustache

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -144,18 +144,25 @@ open class {{classname}} {
144144

145145
let nonNullParameters = APIHelper.rejectNil(formParams)
146146
let parameters = APIHelper.convertBoolToString(nonNullParameters)
147-
{{/hasFormParams}}
148-
{{^hasFormParams}}
147+
{{/hasFormParams}}
148+
{{^hasFormParams}}
149149
let parameters: [String:Any]? = nil
150-
{{/hasFormParams}}
151-
{{/bodyParam}}{{#hasQueryParams}}
150+
{{/hasFormParams}}
151+
{{/bodyParam}}
152+
{{#queryParams}}
153+
{{#@first}}
152154
var url = URLComponents(string: URLString)
153155
url?.queryItems = APIHelper.mapValuesToQueryItems([
154-
{{#queryParams}}
156+
{{/@first}}
155157
{{> _param}}{{#hasMore}}, {{/hasMore}}
156-
{{/queryParams}}
157-
]){{/hasQueryParams}}{{^hasQueryParams}}
158-
let url = URLComponents(string: URLString){{/hasQueryParams}}{{#headerParams}}{{^secondaryParam}}
158+
{{#@last}}
159+
])
160+
{{/@last}}
161+
{{/queryParams}}
162+
{{^queryParams}}
163+
let url = URLComponents(string: URLString)
164+
{{/queryParams}}
165+
{{#headerParams}}{{^secondaryParam}}
159166
let nillableHeaders: [String: Any?] = [{{/secondaryParam}}
160167
{{> _param}}{{#hasMore}},{{/hasMore}}{{^hasMore}}
161168
]

0 commit comments

Comments
 (0)