Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[swift] Rename url & path variables to avoid collision #18969

Merged
merged 1 commit into from
Jun 19, 2024
Merged

[swift] Rename url & path variables to avoid collision #18969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions modules/openapi-generator/src/main/resources/swift-combine/api.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Expand Down
56 changes: 28 additions & 28 deletions samples/client/petstore/swift-combine/client/PetstoreOpenAPI/Sources/APIs/PetAPI.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand Down Expand Up @@ -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()
}
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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()
}
Expand Down Expand Up @@ -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()
}
Expand Down Expand Up @@ -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()
}
Expand Down Expand Up @@ -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()
}
Expand Down
28 changes: 14 additions & 14 deletions samples/client/petstore/swift-combine/client/PetstoreOpenAPI/Sources/APIs/StoreAPI.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand Down Expand Up @@ -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()
}
Expand Down Expand Up @@ -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()
}
Expand Down Expand Up @@ -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()
}
Expand Down
54 changes: 27 additions & 27 deletions samples/client/petstore/swift-combine/client/PetstoreOpenAPI/Sources/APIs/UserAPI.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand Down Expand Up @@ -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()
}
Expand Down Expand Up @@ -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()
}
Expand Down Expand Up @@ -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()
}
Expand Down Expand Up @@ -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()
}
Expand Down Expand Up @@ -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))
Expand Down Expand Up @@ -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()
}
Expand Down Expand Up @@ -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()
}
Expand Down
Loading