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

Fix typo in swift error variable name.

Browse Source
This commit is contained in:
Cristian Oneț 2015-11-11 14:32:02 +02:00
parent 30c361edd7
commit f8db16c5cd
5 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/swagger-codegen/src/main/resources/swift/APIs.mustache
View File

@ -52,7 +52,7 @@ public class RequestBuilder<T> {
} }
} }
public func execute(completion: (response: Response<T>?, erorr: ErrorType?) -> Void) { } public func execute(completion: (response: Response<T>?, error: ErrorType?) -> Void) { }
public func addHeader(name name: String, value: String) -> Self { public func addHeader(name name: String, value: String) -> Self {
if !value.isEmpty { if !value.isEmpty {

16
modules/swagger-codegen/src/main/resources/swift/AlamofireImplementations.mustache
View File

@ -20,7 +20,7 @@ class AlamofireRequestBuilder<T>: RequestBuilder<T> {
super.init(method: method, URLString: URLString, parameters: parameters, isBody: isBody) super.init(method: method, URLString: URLString, parameters: parameters, isBody: isBody)
} }
override func execute(completion: (response: Response<T>?, erorr: ErrorType?) -> Void) { override func execute(completion: (response: Response<T>?, error: ErrorType?) -> Void) {
let managerId = NSUUID().UUIDString let managerId = NSUUID().UUIDString
// Create a new manager for each request to customize its request header // Create a new manager for each request to customize its request header
let configuration = NSURLSessionConfiguration.defaultSessionConfiguration() let configuration = NSURLSessionConfiguration.defaultSessionConfiguration()
@ -60,7 +60,7 @@ class AlamofireRequestBuilder<T>: RequestBuilder<T> {
case .Success(let upload, _, _): case .Success(let upload, _, _):
self.processRequest(upload, managerId, completion) self.processRequest(upload, managerId, completion)
case .Failure(let encodingError): case .Failure(let encodingError):
completion(response: nil, erorr: encodingError) completion(response: nil, error: encodingError)
} }
} }
) )
@ -70,7 +70,7 @@ class AlamofireRequestBuilder<T>: RequestBuilder<T> {
} }
private func processRequest(request: Request, _ managerId: String, _ completion: (response: Response<T>?, erorr: ErrorType?) -> Void) { private func processRequest(request: Request, _ managerId: String, _ completion: (response: Response<T>?, error: ErrorType?) -> Void) {
if let credential = self.credential { if let credential = self.credential {
request.authenticate(usingCredential: credential) request.authenticate(usingCredential: credential)
} }
@ -79,26 +79,26 @@ class AlamofireRequestBuilder<T>: RequestBuilder<T> {
managerStore.removeValueForKey(managerId) managerStore.removeValueForKey(managerId)
if response.result.isFailure { if response.result.isFailure {
completion(response: nil, erorr: response.result.error) completion(response: nil, error: response.result.error)
return return
} }
if () is T { if () is T {
completion(response: Response(response: response.response!, body: () as! T), erorr: nil) completion(response: Response(response: response.response!, body: () as! T), error: nil)
return return
} }
if let json: AnyObject = response.result.value { if let json: AnyObject = response.result.value {
let body = Decoders.decode(clazz: T.self, source: json) let body = Decoders.decode(clazz: T.self, source: json)
completion(response: Response(response: response.response!, body: body), erorr: nil) completion(response: Response(response: response.response!, body: body), error: nil)
return return
} else if "" is T { } else if "" is T {
// swagger-parser currently doesn't support void, which will be fixed in future swagger-parser release // swagger-parser currently doesn't support void, which will be fixed in future swagger-parser release
// https://github.com/swagger-api/swagger-parser/pull/34 // https://github.com/swagger-api/swagger-parser/pull/34
completion(response: Response(response: response.response!, body: "" as! T), erorr: nil) completion(response: Response(response: response.response!, body: "" as! T), error: nil)
return return
} }
completion(response: nil, erorr: NSError(domain: "localhost", code: 500, userInfo: ["reason": "unreacheable code"])) completion(response: nil, error: NSError(domain: "localhost", code: 500, userInfo: ["reason": "unreacheable code"]))
} }
} }

2
samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs.swift
View File

@ -52,7 +52,7 @@ public class RequestBuilder<T> {
} }
} }
public func execute(completion: (response: Response<T>?, erorr: ErrorType?) -> Void) { } public func execute(completion: (response: Response<T>?, error: ErrorType?) -> Void) { }
public func addHeader(name name: String, value: String) -> Self { public func addHeader(name name: String, value: String) -> Self {
if !value.isEmpty { if !value.isEmpty {

16
samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift
View File

@ -52,14 +52,14 @@ extension PetstoreClientAPI {
"petId" : 123456789, "petId" : 123456789,
"quantity" : 123, "quantity" : 123,
"id" : 123456789, "id" : 123456789,
"shipDate" : "2015-11-11T10:03:22.835+0000", "shipDate" : "2015-11-11T12:31:12.079+0000",
"complete" : true, "complete" : true,
"status" : "aeiou" "status" : "aeiou"
}}, {contentType=application/xml, example=<Order> }}, {contentType=application/xml, example=<Order>
<id>123456</id> <id>123456</id>
<petId>123456</petId> <petId>123456</petId>
<quantity>0</quantity> <quantity>0</quantity>
<shipDate>2015-11-11T12:03:22.838Z</shipDate> <shipDate>2015-11-11T14:31:12.082Z</shipDate>
<status>string</status> <status>string</status>
<complete>true</complete> <complete>true</complete>
</Order>}] </Order>}]
@ -67,14 +67,14 @@ extension PetstoreClientAPI {
"petId" : 123456789, "petId" : 123456789,
"quantity" : 123, "quantity" : 123,
"id" : 123456789, "id" : 123456789,
"shipDate" : "2015-11-11T10:03:22.835+0000", "shipDate" : "2015-11-11T12:31:12.079+0000",
"complete" : true, "complete" : true,
"status" : "aeiou" "status" : "aeiou"
}}, {contentType=application/xml, example=<Order> }}, {contentType=application/xml, example=<Order>
<id>123456</id> <id>123456</id>
<petId>123456</petId> <petId>123456</petId>
<quantity>0</quantity> <quantity>0</quantity>
<shipDate>2015-11-11T12:03:22.838Z</shipDate> <shipDate>2015-11-11T14:31:12.082Z</shipDate>
<status>string</status> <status>string</status>
<complete>true</complete> <complete>true</complete>
</Order>}] </Order>}]
@ -104,14 +104,14 @@ extension PetstoreClientAPI {
"petId" : 123456789, "petId" : 123456789,
"quantity" : 123, "quantity" : 123,
"id" : 123456789, "id" : 123456789,
"shipDate" : "2015-11-11T10:03:22.839+0000", "shipDate" : "2015-11-11T12:31:12.083+0000",
"complete" : true, "complete" : true,
"status" : "aeiou" "status" : "aeiou"
}}, {contentType=application/xml, example=<Order> }}, {contentType=application/xml, example=<Order>
<id>123456</id> <id>123456</id>
<petId>123456</petId> <petId>123456</petId>
<quantity>0</quantity> <quantity>0</quantity>
<shipDate>2015-11-11T12:03:22.839Z</shipDate> <shipDate>2015-11-11T14:31:12.083Z</shipDate>
<status>string</status> <status>string</status>
<complete>true</complete> <complete>true</complete>
</Order>}] </Order>}]
@ -119,14 +119,14 @@ extension PetstoreClientAPI {
"petId" : 123456789, "petId" : 123456789,
"quantity" : 123, "quantity" : 123,
"id" : 123456789, "id" : 123456789,
"shipDate" : "2015-11-11T10:03:22.839+0000", "shipDate" : "2015-11-11T12:31:12.083+0000",
"complete" : true, "complete" : true,
"status" : "aeiou" "status" : "aeiou"
}}, {contentType=application/xml, example=<Order> }}, {contentType=application/xml, example=<Order>
<id>123456</id> <id>123456</id>
<petId>123456</petId> <petId>123456</petId>
<quantity>0</quantity> <quantity>0</quantity>
<shipDate>2015-11-11T12:03:22.839Z</shipDate> <shipDate>2015-11-11T14:31:12.083Z</shipDate>
<status>string</status> <status>string</status>
<complete>true</complete> <complete>true</complete>
</Order>}] </Order>}]

16
samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/AlamofireImplementations.swift
View File

@ -20,7 +20,7 @@ class AlamofireRequestBuilder<T>: RequestBuilder<T> {
super.init(method: method, URLString: URLString, parameters: parameters, isBody: isBody) super.init(method: method, URLString: URLString, parameters: parameters, isBody: isBody)
} }
override func execute(completion: (response: Response<T>?, erorr: ErrorType?) -> Void) { override func execute(completion: (response: Response<T>?, error: ErrorType?) -> Void) {
let managerId = NSUUID().UUIDString let managerId = NSUUID().UUIDString
// Create a new manager for each request to customize its request header // Create a new manager for each request to customize its request header
let configuration = NSURLSessionConfiguration.defaultSessionConfiguration() let configuration = NSURLSessionConfiguration.defaultSessionConfiguration()
@ -60,7 +60,7 @@ class AlamofireRequestBuilder<T>: RequestBuilder<T> {
case .Success(let upload, _, _): case .Success(let upload, _, _):
self.processRequest(upload, managerId, completion) self.processRequest(upload, managerId, completion)
case .Failure(let encodingError): case .Failure(let encodingError):
completion(response: nil, erorr: encodingError) completion(response: nil, error: encodingError)
} }
} }
) )
@ -70,7 +70,7 @@ class AlamofireRequestBuilder<T>: RequestBuilder<T> {
} }
private func processRequest(request: Request, _ managerId: String, _ completion: (response: Response<T>?, erorr: ErrorType?) -> Void) { private func processRequest(request: Request, _ managerId: String, _ completion: (response: Response<T>?, error: ErrorType?) -> Void) {
if let credential = self.credential { if let credential = self.credential {
request.authenticate(usingCredential: credential) request.authenticate(usingCredential: credential)
} }
@ -79,26 +79,26 @@ class AlamofireRequestBuilder<T>: RequestBuilder<T> {
managerStore.removeValueForKey(managerId) managerStore.removeValueForKey(managerId)
if response.result.isFailure { if response.result.isFailure {
completion(response: nil, erorr: response.result.error) completion(response: nil, error: response.result.error)
return return
} }
if () is T { if () is T {
completion(response: Response(response: response.response!, body: () as! T), erorr: nil) completion(response: Response(response: response.response!, body: () as! T), error: nil)
return return
} }
if let json: AnyObject = response.result.value { if let json: AnyObject = response.result.value {
let body = Decoders.decode(clazz: T.self, source: json) let body = Decoders.decode(clazz: T.self, source: json)
completion(response: Response(response: response.response!, body: body), erorr: nil) completion(response: Response(response: response.response!, body: body), error: nil)
return return
} else if "" is T { } else if "" is T {
// swagger-parser currently doesn't support void, which will be fixed in future swagger-parser release // swagger-parser currently doesn't support void, which will be fixed in future swagger-parser release
// https://github.com/swagger-api/swagger-parser/pull/34 // https://github.com/swagger-api/swagger-parser/pull/34
completion(response: Response(response: response.response!, body: "" as! T), erorr: nil) completion(response: Response(response: response.response!, body: "" as! T), error: nil)
return return
} }
completion(response: nil, erorr: NSError(domain: "localhost", code: 500, userInfo: ["reason": "unreacheable code"])) completion(response: nil, error: NSError(domain: "localhost", code: 500, userInfo: ["reason": "unreacheable code"]))
} }
} }