Skip to content

Commit cd07040

Browse files
wing328wing328
committed
Merge branch 'andy/swift-rename-url-path' of https://github.com/andyland/openapi-generator into andyland-andy/swift-rename-url-path
2 parents a4d43a8 + 281a6a0 commit cd07040

File tree

4 files changed

+73
-73
lines changed

4 files changed

+73
-73
lines changed

‎modules/openapi-generator/src/main/resources/swift-combine/api.mustache

+4-4
Original file line numberDiff line numberDiff line change
@@ -102,12 +102,12 @@ open class {{classname}} {
102102
guard let baseURL = self.transport.baseURL ?? self.baseURL else {
103103
throw OpenAPITransportError.badURLError()
104104
}
105-
{{#pathParams}}{{#-last}}var{{/-last}}{{/pathParams}}{{^pathParams}}let{{/pathParams}} path = "{{path}}"
105+
{{#pathParams}}{{#-last}}var{{/-last}}{{/pathParams}}{{^pathParams}}let{{/pathParams}} localVarPath = "{{path}}"
106106
{{#pathParams}}
107-
{{#required}}path = path.replacingOccurrences(of: "{{=<% %>=}}{<%baseName%>}<%={{ }}=%>", with: {{> toString}}){{/required}}{{^required}}if let {{paramName}} = {{paramName}} { path = path.replacingOccurrences(of: "{{=<% %>=}}{<%baseName%>}<%={{ }}=%>", with: {{> toString}}) } {{/required}}
107+
{{#required}}localVarPath = localVarPath.replacingOccurrences(of: "{{=<% %>=}}{<%baseName%>}<%={{ }}=%>", with: {{> toString}}){{/required}}{{^required}}if let {{paramName}} = {{paramName}} { localVarPath = localVarPath.replacingOccurrences(of: "{{=<% %>=}}{<%baseName%>}<%={{ }}=%>", with: {{> toString}}) } {{/required}}
108108
{{/pathParams}}
109-
let url = baseURL.appendingPathComponent(path)
110-
{{#hasQueryParams}}var{{/hasQueryParams}}{{^hasQueryParams}}let{{/hasQueryParams}} components = URLComponents(url: url, resolvingAgainstBaseURL: false)
109+
let localVarURL = baseURL.appendingPathComponent(localVarPath)
110+
{{#hasQueryParams}}var{{/hasQueryParams}}{{^hasQueryParams}}let{{/hasQueryParams}} components = URLComponents(url: localVarURL, resolvingAgainstBaseURL: false)
111111
{{#hasQueryParams}}
112112
var queryItems: [URLQueryItem] = []
113113
{{#queryParams}}

‎samples/client/petstore/swift-combine/client/PetstoreOpenAPI/Sources/APIs/PetAPI.swift

+28-28
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ open class PetAPI {
5353
guard let baseURL = self.transport.baseURL ?? self.baseURL else {
5454
throw OpenAPITransportError.badURLError()
5555
}
56-
let path = "/pet"
57-
let url = baseURL.appendingPathComponent(path)
58-
let components = URLComponents(url: url, resolvingAgainstBaseURL: false)
56+
let localVarPath = "/pet"
57+
let localVarURL = baseURL.appendingPathComponent(localVarPath)
58+
let components = URLComponents(url: localVarURL, resolvingAgainstBaseURL: false)
5959
guard let requestURL = components?.url else {
6060
throw OpenAPITransportError.badURLError()
6161
}
@@ -107,10 +107,10 @@ open class PetAPI {
107107
guard let baseURL = self.transport.baseURL ?? self.baseURL else {
108108
throw OpenAPITransportError.badURLError()
109109
}
110-
var path = "/pet/{petId}"
111-
path = path.replacingOccurrences(of: "{petId}", with: "\(petId)")
112-
let url = baseURL.appendingPathComponent(path)
113-
let components = URLComponents(url: url, resolvingAgainstBaseURL: false)
110+
var localVarPath = "/pet/{petId}"
111+
localVarPath = localVarPath.replacingOccurrences(of: "{petId}", with: "\(petId)")
112+
let localVarURL = baseURL.appendingPathComponent(localVarPath)
113+
let components = URLComponents(url: localVarURL, resolvingAgainstBaseURL: false)
114114
guard let requestURL = components?.url else {
115115
throw OpenAPITransportError.badURLError()
116116
}
@@ -170,9 +170,9 @@ open class PetAPI {
170170
guard let baseURL = self.transport.baseURL ?? self.baseURL else {
171171
throw OpenAPITransportError.badURLError()
172172
}
173-
let path = "/pet/findByStatus"
174-
let url = baseURL.appendingPathComponent(path)
175-
var components = URLComponents(url: url, resolvingAgainstBaseURL: false)
173+
let localVarPath = "/pet/findByStatus"
174+
let localVarURL = baseURL.appendingPathComponent(localVarPath)
175+
var components = URLComponents(url: localVarURL, resolvingAgainstBaseURL: false)
176176
var queryItems: [URLQueryItem] = []
177177
queryItems.append(URLQueryItem(name: "status", value: status.map { $0.rawValue }.joined(separator: ",")))
178178
components?.queryItems = queryItems
@@ -225,9 +225,9 @@ open class PetAPI {
225225
guard let baseURL = self.transport.baseURL ?? self.baseURL else {
226226
throw OpenAPITransportError.badURLError()
227227
}
228-
let path = "/pet/findByTags"
229-
let url = baseURL.appendingPathComponent(path)
230-
var components = URLComponents(url: url, resolvingAgainstBaseURL: false)
228+
let localVarPath = "/pet/findByTags"
229+
let localVarURL = baseURL.appendingPathComponent(localVarPath)
230+
var components = URLComponents(url: localVarURL, resolvingAgainstBaseURL: false)
231231
var queryItems: [URLQueryItem] = []
232232
queryItems.append(URLQueryItem(name: "tags", value: tags.joined(separator: ",")))
233233
components?.queryItems = queryItems
@@ -283,10 +283,10 @@ open class PetAPI {
283283
guard let baseURL = self.transport.baseURL ?? self.baseURL else {
284284
throw OpenAPITransportError.badURLError()
285285
}
286-
var path = "/pet/{petId}"
287-
path = path.replacingOccurrences(of: "{petId}", with: "\(petId)")
288-
let url = baseURL.appendingPathComponent(path)
289-
let components = URLComponents(url: url, resolvingAgainstBaseURL: false)
286+
var localVarPath = "/pet/{petId}"
287+
localVarPath = localVarPath.replacingOccurrences(of: "{petId}", with: "\(petId)")
288+
let localVarURL = baseURL.appendingPathComponent(localVarPath)
289+
let components = URLComponents(url: localVarURL, resolvingAgainstBaseURL: false)
290290
guard let requestURL = components?.url else {
291291
throw OpenAPITransportError.badURLError()
292292
}
@@ -349,9 +349,9 @@ open class PetAPI {
349349
guard let baseURL = self.transport.baseURL ?? self.baseURL else {
350350
throw OpenAPITransportError.badURLError()
351351
}
352-
let path = "/pet"
353-
let url = baseURL.appendingPathComponent(path)
354-
let components = URLComponents(url: url, resolvingAgainstBaseURL: false)
352+
let localVarPath = "/pet"
353+
let localVarURL = baseURL.appendingPathComponent(localVarPath)
354+
let components = URLComponents(url: localVarURL, resolvingAgainstBaseURL: false)
355355
guard let requestURL = components?.url else {
356356
throw OpenAPITransportError.badURLError()
357357
}
@@ -410,10 +410,10 @@ open class PetAPI {
410410
guard let baseURL = self.transport.baseURL ?? self.baseURL else {
411411
throw OpenAPITransportError.badURLError()
412412
}
413-
var path = "/pet/{petId}"
414-
path = path.replacingOccurrences(of: "{petId}", with: "\(petId)")
415-
let url = baseURL.appendingPathComponent(path)
416-
let components = URLComponents(url: url, resolvingAgainstBaseURL: false)
413+
var localVarPath = "/pet/{petId}"
414+
localVarPath = localVarPath.replacingOccurrences(of: "{petId}", with: "\(petId)")
415+
let localVarURL = baseURL.appendingPathComponent(localVarPath)
416+
let components = URLComponents(url: localVarURL, resolvingAgainstBaseURL: false)
417417
guard let requestURL = components?.url else {
418418
throw OpenAPITransportError.badURLError()
419419
}
@@ -458,10 +458,10 @@ open class PetAPI {
458458
guard let baseURL = self.transport.baseURL ?? self.baseURL else {
459459
throw OpenAPITransportError.badURLError()
460460
}
461-
var path = "/pet/{petId}/uploadImage"
462-
path = path.replacingOccurrences(of: "{petId}", with: "\(petId)")
463-
let url = baseURL.appendingPathComponent(path)
464-
let components = URLComponents(url: url, resolvingAgainstBaseURL: false)
461+
var localVarPath = "/pet/{petId}/uploadImage"
462+
localVarPath = localVarPath.replacingOccurrences(of: "{petId}", with: "\(petId)")
463+
let localVarURL = baseURL.appendingPathComponent(localVarPath)
464+
let components = URLComponents(url: localVarURL, resolvingAgainstBaseURL: false)
465465
guard let requestURL = components?.url else {
466466
throw OpenAPITransportError.badURLError()
467467
}

‎samples/client/petstore/swift-combine/client/PetstoreOpenAPI/Sources/APIs/StoreAPI.swift

+14-14
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ open class StoreAPI {
5454
guard let baseURL = self.transport.baseURL ?? self.baseURL else {
5555
throw OpenAPITransportError.badURLError()
5656
}
57-
var path = "/store/order/{orderId}"
58-
path = path.replacingOccurrences(of: "{orderId}", with: orderId)
59-
let url = baseURL.appendingPathComponent(path)
60-
let components = URLComponents(url: url, resolvingAgainstBaseURL: false)
57+
var localVarPath = "/store/order/{orderId}"
58+
localVarPath = localVarPath.replacingOccurrences(of: "{orderId}", with: orderId)
59+
let localVarURL = baseURL.appendingPathComponent(localVarPath)
60+
let components = URLComponents(url: localVarURL, resolvingAgainstBaseURL: false)
6161
guard let requestURL = components?.url else {
6262
throw OpenAPITransportError.badURLError()
6363
}
@@ -97,9 +97,9 @@ open class StoreAPI {
9797
guard let baseURL = self.transport.baseURL ?? self.baseURL else {
9898
throw OpenAPITransportError.badURLError()
9999
}
100-
let path = "/store/inventory"
101-
let url = baseURL.appendingPathComponent(path)
102-
let components = URLComponents(url: url, resolvingAgainstBaseURL: false)
100+
let localVarPath = "/store/inventory"
101+
let localVarURL = baseURL.appendingPathComponent(localVarPath)
102+
let components = URLComponents(url: localVarURL, resolvingAgainstBaseURL: false)
103103
guard let requestURL = components?.url else {
104104
throw OpenAPITransportError.badURLError()
105105
}
@@ -143,10 +143,10 @@ open class StoreAPI {
143143
guard let baseURL = self.transport.baseURL ?? self.baseURL else {
144144
throw OpenAPITransportError.badURLError()
145145
}
146-
var path = "/store/order/{orderId}"
147-
path = path.replacingOccurrences(of: "{orderId}", with: "\(orderId)")
148-
let url = baseURL.appendingPathComponent(path)
149-
let components = URLComponents(url: url, resolvingAgainstBaseURL: false)
146+
var localVarPath = "/store/order/{orderId}"
147+
localVarPath = localVarPath.replacingOccurrences(of: "{orderId}", with: "\(orderId)")
148+
let localVarURL = baseURL.appendingPathComponent(localVarPath)
149+
let components = URLComponents(url: localVarURL, resolvingAgainstBaseURL: false)
150150
guard let requestURL = components?.url else {
151151
throw OpenAPITransportError.badURLError()
152152
}
@@ -195,9 +195,9 @@ open class StoreAPI {
195195
guard let baseURL = self.transport.baseURL ?? self.baseURL else {
196196
throw OpenAPITransportError.badURLError()
197197
}
198-
let path = "/store/order"
199-
let url = baseURL.appendingPathComponent(path)
200-
let components = URLComponents(url: url, resolvingAgainstBaseURL: false)
198+
let localVarPath = "/store/order"
199+
let localVarURL = baseURL.appendingPathComponent(localVarPath)
200+
let components = URLComponents(url: localVarURL, resolvingAgainstBaseURL: false)
201201
guard let requestURL = components?.url else {
202202
throw OpenAPITransportError.badURLError()
203203
}

‎samples/client/petstore/swift-combine/client/PetstoreOpenAPI/Sources/APIs/UserAPI.swift

+27-27
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ open class UserAPI {
4242
guard let baseURL = self.transport.baseURL ?? self.baseURL else {
4343
throw OpenAPITransportError.badURLError()
4444
}
45-
let path = "/user"
46-
let url = baseURL.appendingPathComponent(path)
47-
let components = URLComponents(url: url, resolvingAgainstBaseURL: false)
45+
let localVarPath = "/user"
46+
let localVarURL = baseURL.appendingPathComponent(localVarPath)
47+
let components = URLComponents(url: localVarURL, resolvingAgainstBaseURL: false)
4848
guard let requestURL = components?.url else {
4949
throw OpenAPITransportError.badURLError()
5050
}
@@ -78,9 +78,9 @@ open class UserAPI {
7878
guard let baseURL = self.transport.baseURL ?? self.baseURL else {
7979
throw OpenAPITransportError.badURLError()
8080
}
81-
let path = "/user/createWithArray"
82-
let url = baseURL.appendingPathComponent(path)
83-
let components = URLComponents(url: url, resolvingAgainstBaseURL: false)
81+
let localVarPath = "/user/createWithArray"
82+
let localVarURL = baseURL.appendingPathComponent(localVarPath)
83+
let components = URLComponents(url: localVarURL, resolvingAgainstBaseURL: false)
8484
guard let requestURL = components?.url else {
8585
throw OpenAPITransportError.badURLError()
8686
}
@@ -114,9 +114,9 @@ open class UserAPI {
114114
guard let baseURL = self.transport.baseURL ?? self.baseURL else {
115115
throw OpenAPITransportError.badURLError()
116116
}
117-
let path = "/user/createWithList"
118-
let url = baseURL.appendingPathComponent(path)
119-
let components = URLComponents(url: url, resolvingAgainstBaseURL: false)
117+
let localVarPath = "/user/createWithList"
118+
let localVarURL = baseURL.appendingPathComponent(localVarPath)
119+
let components = URLComponents(url: localVarURL, resolvingAgainstBaseURL: false)
120120
guard let requestURL = components?.url else {
121121
throw OpenAPITransportError.badURLError()
122122
}
@@ -165,10 +165,10 @@ open class UserAPI {
165165
guard let baseURL = self.transport.baseURL ?? self.baseURL else {
166166
throw OpenAPITransportError.badURLError()
167167
}
168-
var path = "/user/{username}"
169-
path = path.replacingOccurrences(of: "{username}", with: username)
170-
let url = baseURL.appendingPathComponent(path)
171-
let components = URLComponents(url: url, resolvingAgainstBaseURL: false)
168+
var localVarPath = "/user/{username}"
169+
localVarPath = localVarPath.replacingOccurrences(of: "{username}", with: username)
170+
let localVarURL = baseURL.appendingPathComponent(localVarPath)
171+
let components = URLComponents(url: localVarURL, resolvingAgainstBaseURL: false)
172172
guard let requestURL = components?.url else {
173173
throw OpenAPITransportError.badURLError()
174174
}
@@ -221,10 +221,10 @@ open class UserAPI {
221221
guard let baseURL = self.transport.baseURL ?? self.baseURL else {
222222
throw OpenAPITransportError.badURLError()
223223
}
224-
var path = "/user/{username}"
225-
path = path.replacingOccurrences(of: "{username}", with: username)
226-
let url = baseURL.appendingPathComponent(path)
227-
let components = URLComponents(url: url, resolvingAgainstBaseURL: false)
224+
var localVarPath = "/user/{username}"
225+
localVarPath = localVarPath.replacingOccurrences(of: "{username}", with: username)
226+
let localVarURL = baseURL.appendingPathComponent(localVarPath)
227+
let components = URLComponents(url: localVarURL, resolvingAgainstBaseURL: false)
228228
guard let requestURL = components?.url else {
229229
throw OpenAPITransportError.badURLError()
230230
}
@@ -275,9 +275,9 @@ open class UserAPI {
275275
guard let baseURL = self.transport.baseURL ?? self.baseURL else {
276276
throw OpenAPITransportError.badURLError()
277277
}
278-
let path = "/user/login"
279-
let url = baseURL.appendingPathComponent(path)
280-
var components = URLComponents(url: url, resolvingAgainstBaseURL: false)
278+
let localVarPath = "/user/login"
279+
let localVarURL = baseURL.appendingPathComponent(localVarPath)
280+
var components = URLComponents(url: localVarURL, resolvingAgainstBaseURL: false)
281281
var queryItems: [URLQueryItem] = []
282282
queryItems.append(URLQueryItem(name: "username", value: username))
283283
queryItems.append(URLQueryItem(name: "password", value: password))
@@ -318,9 +318,9 @@ open class UserAPI {
318318
guard let baseURL = self.transport.baseURL ?? self.baseURL else {
319319
throw OpenAPITransportError.badURLError()
320320
}
321-
let path = "/user/logout"
322-
let url = baseURL.appendingPathComponent(path)
323-
let components = URLComponents(url: url, resolvingAgainstBaseURL: false)
321+
let localVarPath = "/user/logout"
322+
let localVarURL = baseURL.appendingPathComponent(localVarPath)
323+
let components = URLComponents(url: localVarURL, resolvingAgainstBaseURL: false)
324324
guard let requestURL = components?.url else {
325325
throw OpenAPITransportError.badURLError()
326326
}
@@ -368,10 +368,10 @@ open class UserAPI {
368368
guard let baseURL = self.transport.baseURL ?? self.baseURL else {
369369
throw OpenAPITransportError.badURLError()
370370
}
371-
var path = "/user/{username}"
372-
path = path.replacingOccurrences(of: "{username}", with: username)
373-
let url = baseURL.appendingPathComponent(path)
374-
let components = URLComponents(url: url, resolvingAgainstBaseURL: false)
371+
var localVarPath = "/user/{username}"
372+
localVarPath = localVarPath.replacingOccurrences(of: "{username}", with: username)
373+
let localVarURL = baseURL.appendingPathComponent(localVarPath)
374+
let components = URLComponents(url: localVarURL, resolvingAgainstBaseURL: false)
375375
guard let requestURL = components?.url else {
376376
throw OpenAPITransportError.badURLError()
377377
}

0 commit comments

Comments
 (0)