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

[swift] Issue 18940: Rename url & path variables to avoid collision (#18969)

Browse Source
This commit is contained in:
Andy☼ McSherry☼ 2024-06-19 02:03:12 -07:00 committed by GitHub
parent a4d43a8376
commit a4b577ddc7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 73 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/openapi-generator/src/main/resources/swift-combine/api.mustache vendored
View File

@ -102,12 +102,12 @@ open class {{classname}} {
guard let baseURL = self.transport.baseURL ?? self.baseURL else {
throw OpenAPITransportError.badURLError()
}
{{#pathParams}}{{#-last}}var{{/-last}}{{/pathParams}}{{^pathParams}}let{{/pathParams}} path = "{{path}}"
{{#pathParams}}{{#-last}}var{{/-last}}{{/pathParams}}{{^pathParams}}let{{/pathParams}} localVarPath = "{{path}}"
{{#pathParams}}
{{#required}}path = path.replacingOccurrences(of: "{{=<% %>=}}{<%baseName%>}<%={{ }}=%>", with: {{> toString}}){{/required}}{{^required}}if let {{paramName}} = {{paramName}} { path = path.replacingOccurrences(of: "{{=<% %>=}}{<%baseName%>}<%={{ }}=%>", with: {{> toString}}) } {{/required}}
{{#required}}localVarPath = localVarPath.replacingOccurrences(of: "{{=<% %>=}}{<%baseName%>}<%={{ }}=%>", with: {{> toString}}){{/required}}{{^required}}if let {{paramName}} = {{paramName}} { localVarPath = localVarPath.replacingOccurrences(of: "{{=<% %>=}}{<%baseName%>}<%={{ }}=%>", with: {{> toString}}) } {{/required}}
{{/pathParams}}
let url = baseURL.appendingPathComponent(path)
{{#hasQueryParams}}var{{/hasQueryParams}}{{^hasQueryParams}}let{{/hasQueryParams}} components = URLComponents(url: url, resolvingAgainstBaseURL: false)
let localVarURL = baseURL.appendingPathComponent(localVarPath)
{{#hasQueryParams}}var{{/hasQueryParams}}{{^hasQueryParams}}let{{/hasQueryParams}} components = URLComponents(url: localVarURL, resolvingAgainstBaseURL: false)
{{#hasQueryParams}}
var queryItems: [URLQueryItem] = []
{{#queryParams}}

56
samples/client/petstore/swift-combine/client/PetstoreOpenAPI/Sources/APIs/PetAPI.swift
View File

@ -53,9 +53,9 @@ open class PetAPI {
guard let baseURL = self.transport.baseURL ?? self.baseURL else {
throw OpenAPITransportError.badURLError()
}
let path = "/pet"
let url = baseURL.appendingPathComponent(path)
let components = URLComponents(url: url, resolvingAgainstBaseURL: false)
let localVarPath = "/pet"
let localVarURL = baseURL.appendingPathComponent(localVarPath)
let components = URLComponents(url: localVarURL, resolvingAgainstBaseURL: false)
guard let requestURL = components?.url else {
throw OpenAPITransportError.badURLError()
}
@ -107,10 +107,10 @@ open class PetAPI {
guard let baseURL = self.transport.baseURL ?? self.baseURL else {
throw OpenAPITransportError.badURLError()
}
var path = "/pet/{petId}"
path = path.replacingOccurrences(of: "{petId}", with: "\(petId)")
let url = baseURL.appendingPathComponent(path)
let components = URLComponents(url: url, resolvingAgainstBaseURL: false)
var localVarPath = "/pet/{petId}"
localVarPath = localVarPath.replacingOccurrences(of: "{petId}", with: "\(petId)")
let localVarURL = baseURL.appendingPathComponent(localVarPath)
let components = URLComponents(url: localVarURL, resolvingAgainstBaseURL: false)
guard let requestURL = components?.url else {
throw OpenAPITransportError.badURLError()
}
@ -170,9 +170,9 @@ open class PetAPI {
guard let baseURL = self.transport.baseURL ?? self.baseURL else {
throw OpenAPITransportError.badURLError()
}
let path = "/pet/findByStatus"
let url = baseURL.appendingPathComponent(path)
var components = URLComponents(url: url, resolvingAgainstBaseURL: false)
let localVarPath = "/pet/findByStatus"
let localVarURL = baseURL.appendingPathComponent(localVarPath)
var components = URLComponents(url: localVarURL, resolvingAgainstBaseURL: false)
var queryItems: [URLQueryItem] = []
queryItems.append(URLQueryItem(name: "status", value: status.map { $0.rawValue }.joined(separator: ",")))
components?.queryItems = queryItems
@ -225,9 +225,9 @@ open class PetAPI {
guard let baseURL = self.transport.baseURL ?? self.baseURL else {
throw OpenAPITransportError.badURLError()
}
let path = "/pet/findByTags"
let url = baseURL.appendingPathComponent(path)
var components = URLComponents(url: url, resolvingAgainstBaseURL: false)
let localVarPath = "/pet/findByTags"
let localVarURL = baseURL.appendingPathComponent(localVarPath)
var components = URLComponents(url: localVarURL, resolvingAgainstBaseURL: false)
var queryItems: [URLQueryItem] = []
queryItems.append(URLQueryItem(name: "tags", value: tags.joined(separator: ",")))
components?.queryItems = queryItems
@ -283,10 +283,10 @@ open class PetAPI {
guard let baseURL = self.transport.baseURL ?? self.baseURL else {
throw OpenAPITransportError.badURLError()
}
var path = "/pet/{petId}"
path = path.replacingOccurrences(of: "{petId}", with: "\(petId)")
let url = baseURL.appendingPathComponent(path)
let components = URLComponents(url: url, resolvingAgainstBaseURL: false)
var localVarPath = "/pet/{petId}"
localVarPath = localVarPath.replacingOccurrences(of: "{petId}", with: "\(petId)")
let localVarURL = baseURL.appendingPathComponent(localVarPath)
let components = URLComponents(url: localVarURL, resolvingAgainstBaseURL: false)
guard let requestURL = components?.url else {
throw OpenAPITransportError.badURLError()
}
@ -349,9 +349,9 @@ open class PetAPI {
guard let baseURL = self.transport.baseURL ?? self.baseURL else {
throw OpenAPITransportError.badURLError()
}
let path = "/pet"
let url = baseURL.appendingPathComponent(path)
let components = URLComponents(url: url, resolvingAgainstBaseURL: false)
let localVarPath = "/pet"
let localVarURL = baseURL.appendingPathComponent(localVarPath)
let components = URLComponents(url: localVarURL, resolvingAgainstBaseURL: false)
guard let requestURL = components?.url else {
throw OpenAPITransportError.badURLError()
}
@ -410,10 +410,10 @@ open class PetAPI {
guard let baseURL = self.transport.baseURL ?? self.baseURL else {
throw OpenAPITransportError.badURLError()
}
var path = "/pet/{petId}"
path = path.replacingOccurrences(of: "{petId}", with: "\(petId)")
let url = baseURL.appendingPathComponent(path)
let components = URLComponents(url: url, resolvingAgainstBaseURL: false)
var localVarPath = "/pet/{petId}"
localVarPath = localVarPath.replacingOccurrences(of: "{petId}", with: "\(petId)")
let localVarURL = baseURL.appendingPathComponent(localVarPath)
let components = URLComponents(url: localVarURL, resolvingAgainstBaseURL: false)
guard let requestURL = components?.url else {
throw OpenAPITransportError.badURLError()
}
@ -458,10 +458,10 @@ open class PetAPI {
guard let baseURL = self.transport.baseURL ?? self.baseURL else {
throw OpenAPITransportError.badURLError()
}
var path = "/pet/{petId}/uploadImage"
path = path.replacingOccurrences(of: "{petId}", with: "\(petId)")
let url = baseURL.appendingPathComponent(path)
let components = URLComponents(url: url, resolvingAgainstBaseURL: false)
var localVarPath = "/pet/{petId}/uploadImage"
localVarPath = localVarPath.replacingOccurrences(of: "{petId}", with: "\(petId)")
let localVarURL = baseURL.appendingPathComponent(localVarPath)
let components = URLComponents(url: localVarURL, resolvingAgainstBaseURL: false)
guard let requestURL = components?.url else {
throw OpenAPITransportError.badURLError()
}

28
samples/client/petstore/swift-combine/client/PetstoreOpenAPI/Sources/APIs/StoreAPI.swift
View File

@ -54,10 +54,10 @@ open class StoreAPI {
guard let baseURL = self.transport.baseURL ?? self.baseURL else {
throw OpenAPITransportError.badURLError()
}
var path = "/store/order/{orderId}"
path = path.replacingOccurrences(of: "{orderId}", with: orderId)
let url = baseURL.appendingPathComponent(path)
let components = URLComponents(url: url, resolvingAgainstBaseURL: false)
var localVarPath = "/store/order/{orderId}"
localVarPath = localVarPath.replacingOccurrences(of: "{orderId}", with: orderId)
let localVarURL = baseURL.appendingPathComponent(localVarPath)
let components = URLComponents(url: localVarURL, resolvingAgainstBaseURL: false)
guard let requestURL = components?.url else {
throw OpenAPITransportError.badURLError()
}
@ -97,9 +97,9 @@ open class StoreAPI {
guard let baseURL = self.transport.baseURL ?? self.baseURL else {
throw OpenAPITransportError.badURLError()
}
let path = "/store/inventory"
let url = baseURL.appendingPathComponent(path)
let components = URLComponents(url: url, resolvingAgainstBaseURL: false)
let localVarPath = "/store/inventory"
let localVarURL = baseURL.appendingPathComponent(localVarPath)
let components = URLComponents(url: localVarURL, resolvingAgainstBaseURL: false)
guard let requestURL = components?.url else {
throw OpenAPITransportError.badURLError()
}
@ -143,10 +143,10 @@ open class StoreAPI {
guard let baseURL = self.transport.baseURL ?? self.baseURL else {
throw OpenAPITransportError.badURLError()
}
var path = "/store/order/{orderId}"
path = path.replacingOccurrences(of: "{orderId}", with: "\(orderId)")
let url = baseURL.appendingPathComponent(path)
let components = URLComponents(url: url, resolvingAgainstBaseURL: false)
var localVarPath = "/store/order/{orderId}"
localVarPath = localVarPath.replacingOccurrences(of: "{orderId}", with: "\(orderId)")
let localVarURL = baseURL.appendingPathComponent(localVarPath)
let components = URLComponents(url: localVarURL, resolvingAgainstBaseURL: false)
guard let requestURL = components?.url else {
throw OpenAPITransportError.badURLError()
}
@ -195,9 +195,9 @@ open class StoreAPI {
guard let baseURL = self.transport.baseURL ?? self.baseURL else {
throw OpenAPITransportError.badURLError()
}
let path = "/store/order"
let url = baseURL.appendingPathComponent(path)
let components = URLComponents(url: url, resolvingAgainstBaseURL: false)
let localVarPath = "/store/order"
let localVarURL = baseURL.appendingPathComponent(localVarPath)
let components = URLComponents(url: localVarURL, resolvingAgainstBaseURL: false)
guard let requestURL = components?.url else {
throw OpenAPITransportError.badURLError()
}

54
samples/client/petstore/swift-combine/client/PetstoreOpenAPI/Sources/APIs/UserAPI.swift
View File

@ -42,9 +42,9 @@ open class UserAPI {
guard let baseURL = self.transport.baseURL ?? self.baseURL else {
throw OpenAPITransportError.badURLError()
}
let path = "/user"
let url = baseURL.appendingPathComponent(path)
let components = URLComponents(url: url, resolvingAgainstBaseURL: false)
let localVarPath = "/user"
let localVarURL = baseURL.appendingPathComponent(localVarPath)
let components = URLComponents(url: localVarURL, resolvingAgainstBaseURL: false)
guard let requestURL = components?.url else {
throw OpenAPITransportError.badURLError()
}
@ -78,9 +78,9 @@ open class UserAPI {
guard let baseURL = self.transport.baseURL ?? self.baseURL else {
throw OpenAPITransportError.badURLError()
}
let path = "/user/createWithArray"
let url = baseURL.appendingPathComponent(path)
let components = URLComponents(url: url, resolvingAgainstBaseURL: false)
let localVarPath = "/user/createWithArray"
let localVarURL = baseURL.appendingPathComponent(localVarPath)
let components = URLComponents(url: localVarURL, resolvingAgainstBaseURL: false)
guard let requestURL = components?.url else {
throw OpenAPITransportError.badURLError()
}
@ -114,9 +114,9 @@ open class UserAPI {
guard let baseURL = self.transport.baseURL ?? self.baseURL else {
throw OpenAPITransportError.badURLError()
}
let path = "/user/createWithList"
let url = baseURL.appendingPathComponent(path)
let components = URLComponents(url: url, resolvingAgainstBaseURL: false)
let localVarPath = "/user/createWithList"
let localVarURL = baseURL.appendingPathComponent(localVarPath)
let components = URLComponents(url: localVarURL, resolvingAgainstBaseURL: false)
guard let requestURL = components?.url else {
throw OpenAPITransportError.badURLError()
}
@ -165,10 +165,10 @@ open class UserAPI {
guard let baseURL = self.transport.baseURL ?? self.baseURL else {
throw OpenAPITransportError.badURLError()
}
var path = "/user/{username}"
path = path.replacingOccurrences(of: "{username}", with: username)
let url = baseURL.appendingPathComponent(path)
let components = URLComponents(url: url, resolvingAgainstBaseURL: false)
var localVarPath = "/user/{username}"
localVarPath = localVarPath.replacingOccurrences(of: "{username}", with: username)
let localVarURL = baseURL.appendingPathComponent(localVarPath)
let components = URLComponents(url: localVarURL, resolvingAgainstBaseURL: false)
guard let requestURL = components?.url else {
throw OpenAPITransportError.badURLError()
}
@ -221,10 +221,10 @@ open class UserAPI {
guard let baseURL = self.transport.baseURL ?? self.baseURL else {
throw OpenAPITransportError.badURLError()
}
var path = "/user/{username}"
path = path.replacingOccurrences(of: "{username}", with: username)
let url = baseURL.appendingPathComponent(path)
let components = URLComponents(url: url, resolvingAgainstBaseURL: false)
var localVarPath = "/user/{username}"
localVarPath = localVarPath.replacingOccurrences(of: "{username}", with: username)
let localVarURL = baseURL.appendingPathComponent(localVarPath)
let components = URLComponents(url: localVarURL, resolvingAgainstBaseURL: false)
guard let requestURL = components?.url else {
throw OpenAPITransportError.badURLError()
}
@ -275,9 +275,9 @@ open class UserAPI {
guard let baseURL = self.transport.baseURL ?? self.baseURL else {
throw OpenAPITransportError.badURLError()
}
let path = "/user/login"
let url = baseURL.appendingPathComponent(path)
var components = URLComponents(url: url, resolvingAgainstBaseURL: false)
let localVarPath = "/user/login"
let localVarURL = baseURL.appendingPathComponent(localVarPath)
var components = URLComponents(url: localVarURL, resolvingAgainstBaseURL: false)
var queryItems: [URLQueryItem] = []
queryItems.append(URLQueryItem(name: "username", value: username))
queryItems.append(URLQueryItem(name: "password", value: password))
@ -318,9 +318,9 @@ open class UserAPI {
guard let baseURL = self.transport.baseURL ?? self.baseURL else {
throw OpenAPITransportError.badURLError()
}
let path = "/user/logout"
let url = baseURL.appendingPathComponent(path)
let components = URLComponents(url: url, resolvingAgainstBaseURL: false)
let localVarPath = "/user/logout"
let localVarURL = baseURL.appendingPathComponent(localVarPath)
let components = URLComponents(url: localVarURL, resolvingAgainstBaseURL: false)
guard let requestURL = components?.url else {
throw OpenAPITransportError.badURLError()
}
@ -368,10 +368,10 @@ open class UserAPI {
guard let baseURL = self.transport.baseURL ?? self.baseURL else {
throw OpenAPITransportError.badURLError()
}
var path = "/user/{username}"
path = path.replacingOccurrences(of: "{username}", with: username)
let url = baseURL.appendingPathComponent(path)
let components = URLComponents(url: url, resolvingAgainstBaseURL: false)
var localVarPath = "/user/{username}"
localVarPath = localVarPath.replacingOccurrences(of: "{username}", with: username)
let localVarURL = baseURL.appendingPathComponent(localVarPath)
let components = URLComponents(url: localVarURL, resolvingAgainstBaseURL: false)
guard let requestURL = components?.url else {
throw OpenAPITransportError.badURLError()
}