Skip to content

Commit

Permalink
[Swift5][client] try to fix JsonEncondable
Browse files Browse the repository at this point in the history
  • Loading branch information
@4brunu
4brunu committed Feb 7, 2022
1 parent 5180047 commit 4647a79
Show file tree
Hide file tree
Showing 33 changed files with 213 additions and 96 deletions.
6 changes: 1 addition & 5 deletions modules/openapi-generator/src/main/resources/swift5/Extensions.mustache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,7 @@ extension Date: JSONEncodable {

extension JSONEncodable where Self: Encodable {
func encodeToJSON() -> Any {
let encoder = CodableHelper.jsonEncoder
guard let data = try? encoder.encode(self) else {
fatalError("Could not encode to json: \(self)")
}
return data.encodeToJSON()
return self
}
}{{/useVapor}}{{#generateModelAdditionalProperties}}

Expand Down
24 changes: 16 additions & 8 deletions ...generator/src/main/resources/swift5/libraries/alamofire/AlamofireImplementations.mustache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,22 +102,30 @@ private var managerStore = SynchronizedDictionary<String, Alamofire.Session>()
encoding = nil
let upload = manager.upload(multipartFormData: { mpForm in
for (k, v) in self.parameters! {
switch v {
for (key, value) in self.parameters! {
switch value {
case let fileURL as URL:
if let mimeType = self.contentTypeForFormPart(fileURL: fileURL) {
mpForm.append(fileURL, withName: k, fileName: fileURL.lastPathComponent, mimeType: mimeType)
mpForm.append(fileURL, withName: key, fileName: fileURL.lastPathComponent, mimeType: mimeType)
} else {
mpForm.append(fileURL, withName: k)
mpForm.append(fileURL, withName: key)
}
case let string as String:
mpForm.append(string.data(using: String.Encoding.utf8)!, withName: k)
if let data = string.data(using: String.Encoding.utf8) {
mpForm.append(data, withName: key)
}
case let number as NSNumber:
mpForm.append(number.stringValue.data(using: String.Encoding.utf8)!, withName: k)
if let data = number.stringValue.data(using: String.Encoding.utf8) {
mpForm.append(data, withName: key)
}
case let data as Data:
mpForm.append(data, withName: k)
mpForm.append(data, withName: key)
case let jsonEncodable as JSONEncodable:
if let data = try? CodableHelper.jsonEncoder.encode(jsonEncodable) {
mpForm.append(data, withName: key)
}
default:
fatalError("Unprocessable value \(v) with key \(k)")
fatalError("Unprocessable value \(value) with key \(key)")
}
}
}, to: URLString, method: xMethod, headers: nil)
Expand Down
11 changes: 11 additions & 0 deletions ...nerator/src/main/resources/swift5/libraries/urlsession/URLSessionImplementations.mustache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -486,6 +486,17 @@ private class FormDataEncoding: ParameterEncoding {
data: data
)

case let jsonEncodable as JSONEncodable:

if let data = try? CodableHelper.jsonEncoder.encode(jsonEncodable) {

This comment has been minimized.

Sign in to view

Copy link
@4brunu

4brunu Feb 7, 2022

Author Owner

protocol 'JSONEncodable' as a type cannot conform to 'Encodable'
urlRequest = configureDataUploadRequest(
urlRequest: urlRequest,
boundary: boundary,
name: key,
data: data
)
}

default:
fatalError("Unprocessable value \(value) with key \(key)")
}
Expand Down
24 changes: 16 additions & 8 deletions ...re/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,22 +102,30 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
encoding = nil

let upload = manager.upload(multipartFormData: { mpForm in
for (k, v) in self.parameters! {
switch v {
for (key, value) in self.parameters! {
switch value {
case let fileURL as URL:
if let mimeType = self.contentTypeForFormPart(fileURL: fileURL) {
mpForm.append(fileURL, withName: k, fileName: fileURL.lastPathComponent, mimeType: mimeType)
mpForm.append(fileURL, withName: key, fileName: fileURL.lastPathComponent, mimeType: mimeType)
} else {
mpForm.append(fileURL, withName: k)
mpForm.append(fileURL, withName: key)
}
case let string as String:
mpForm.append(string.data(using: String.Encoding.utf8)!, withName: k)
if let data = string.data(using: String.Encoding.utf8) {
mpForm.append(data, withName: key)
}
case let number as NSNumber:
mpForm.append(number.stringValue.data(using: String.Encoding.utf8)!, withName: k)
if let data = number.stringValue.data(using: String.Encoding.utf8) {
mpForm.append(data, withName: key)
}
case let data as Data:
mpForm.append(data, withName: k)
mpForm.append(data, withName: key)
case let jsonEncodable as JSONEncodable:
if let data = try? CodableHelper.jsonEncoder.encode(jsonEncodable) {
mpForm.append(data, withName: key)
}
default:
fatalError("Unprocessable value \(v) with key \(k)")
fatalError("Unprocessable value \(value) with key \(key)")
}
}
}, to: URLString, method: xMethod, headers: nil)
Expand Down
6 changes: 1 addition & 5 deletions .../client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,7 @@ extension Date: JSONEncodable {

extension JSONEncodable where Self: Encodable {
func encodeToJSON() -> Any {
let encoder = CodableHelper.jsonEncoder
guard let data = try? encoder.encode(self) else {
fatalError("Could not encode to json: \(self)")
}
return data.encodeToJSON()
return self
}
}

Expand Down
6 changes: 1 addition & 5 deletions ...client/petstore/swift5/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,7 @@ extension Date: JSONEncodable {

extension JSONEncodable where Self: Encodable {
func encodeToJSON() -> Any {
let encoder = CodableHelper.jsonEncoder
guard let data = try? encoder.encode(self) else {
fatalError("Could not encode to json: \(self)")
}
return data.encodeToJSON()
return self
}
}

Expand Down
11 changes: 11 additions & 0 deletions .../swift5/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -486,6 +486,17 @@ private class FormDataEncoding: ParameterEncoding {
data: data
)

case let jsonEncodable as JSONEncodable:

if let data = try? CodableHelper.jsonEncoder.encode(jsonEncodable) {
urlRequest = configureDataUploadRequest(
urlRequest: urlRequest,
boundary: boundary,
name: key,
data: data
)
}

default:
fatalError("Unprocessable value \(value) with key \(key)")
}
Expand Down
6 changes: 1 addition & 5 deletions ...es/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,7 @@ extension Date: JSONEncodable {

extension JSONEncodable where Self: Encodable {
func encodeToJSON() -> Any {
let encoder = CodableHelper.jsonEncoder
guard let data = try? encoder.encode(self) else {
fatalError("Could not encode to json: \(self)")
}
return data.encodeToJSON()
return self
}
}

Expand Down
11 changes: 11 additions & 0 deletions ...ore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -486,6 +486,17 @@ private class FormDataEncoding: ParameterEncoding {
data: data
)

case let jsonEncodable as JSONEncodable:

if let data = try? CodableHelper.jsonEncoder.encode(jsonEncodable) {
urlRequest = configureDataUploadRequest(
urlRequest: urlRequest,
boundary: boundary,
name: key,
data: data
)
}

default:
fatalError("Unprocessable value \(value) with key \(key)")
}
Expand Down
6 changes: 1 addition & 5 deletions samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Extensions.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,7 @@ extension Date: JSONEncodable {

extension JSONEncodable where Self: Encodable {
func encodeToJSON() -> Any {
let encoder = CodableHelper.jsonEncoder
guard let data = try? encoder.encode(self) else {
fatalError("Could not encode to json: \(self)")
}
return data.encodeToJSON()
return self
}
}

Expand Down
11 changes: 11 additions & 0 deletions ...t/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -486,6 +486,17 @@ private class FormDataEncoding: ParameterEncoding {
data: data
)

case let jsonEncodable as JSONEncodable:

if let data = try? CodableHelper.jsonEncoder.encode(jsonEncodable) {
urlRequest = configureDataUploadRequest(
urlRequest: urlRequest,
boundary: boundary,
name: key,
data: data
)
}

default:
fatalError("Unprocessable value \(value) with key \(key)")
}
Expand Down
6 changes: 1 addition & 5 deletions samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/Extensions.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,7 @@ extension Date: JSONEncodable {

extension JSONEncodable where Self: Encodable {
func encodeToJSON() -> Any {
let encoder = CodableHelper.jsonEncoder
guard let data = try? encoder.encode(self) else {
fatalError("Could not encode to json: \(self)")
}
return data.encodeToJSON()
return self
}
}

Expand Down
11 changes: 11 additions & 0 deletions ...etstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -486,6 +486,17 @@ private class FormDataEncoding: ParameterEncoding {
data: data
)

case let jsonEncodable as JSONEncodable:

if let data = try? CodableHelper.jsonEncoder.encode(jsonEncodable) {
urlRequest = configureDataUploadRequest(
urlRequest: urlRequest,
boundary: boundary,
name: key,
data: data
)
}

default:
fatalError("Unprocessable value \(value) with key \(key)")
}
Expand Down
6 changes: 1 addition & 5 deletions samples/client/petstore/swift5/frozenEnums/PetstoreClient/Classes/OpenAPIs/Extensions.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,7 @@ extension Date: JSONEncodable {

extension JSONEncodable where Self: Encodable {
func encodeToJSON() -> Any {
let encoder = CodableHelper.jsonEncoder
guard let data = try? encoder.encode(self) else {
fatalError("Could not encode to json: \(self)")
}
return data.encodeToJSON()
return self
}
}

Expand Down
11 changes: 11 additions & 0 deletions ...tstore/swift5/frozenEnums/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -486,6 +486,17 @@ private class FormDataEncoding: ParameterEncoding {
data: data
)

case let jsonEncodable as JSONEncodable:

if let data = try? CodableHelper.jsonEncoder.encode(jsonEncodable) {
urlRequest = configureDataUploadRequest(
urlRequest: urlRequest,
boundary: boundary,
name: key,
data: data
)
}

default:
fatalError("Unprocessable value \(value) with key \(key)")
}
Expand Down
6 changes: 1 addition & 5 deletions samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Extensions.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,7 @@ extension Date: JSONEncodable {

extension JSONEncodable where Self: Encodable {
func encodeToJSON() -> Any {
let encoder = CodableHelper.jsonEncoder
guard let data = try? encoder.encode(self) else {
fatalError("Could not encode to json: \(self)")
}
return data.encodeToJSON()
return self
}
}

Expand Down
11 changes: 11 additions & 0 deletions ...store/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -486,6 +486,17 @@ private class FormDataEncoding: ParameterEncoding {
data: data
)

case let jsonEncodable as JSONEncodable:

if let data = try? CodableHelper.jsonEncoder.encode(jsonEncodable) {
urlRequest = configureDataUploadRequest(
urlRequest: urlRequest,
boundary: boundary,
name: key,
data: data
)
}

default:
fatalError("Unprocessable value \(value) with key \(key)")
}
Expand Down
6 changes: 1 addition & 5 deletions ...es/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Extensions.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,7 @@ extension Date: JSONEncodable {

extension JSONEncodable where Self: Encodable {
func encodeToJSON() -> Any {
let encoder = CodableHelper.jsonEncoder
guard let data = try? encoder.encode(self) else {
fatalError("Could not encode to json: \(self)")
}
return data.encodeToJSON()
return self
}
}

Expand Down
11 changes: 11 additions & 0 deletions ...ore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -486,6 +486,17 @@ private class FormDataEncoding: ParameterEncoding {
data: data
)

case let jsonEncodable as JSONEncodable:

if let data = try? CodableHelper.jsonEncoder.encode(jsonEncodable) {
urlRequest = configureDataUploadRequest(
urlRequest: urlRequest,
boundary: boundary,
name: key,
data: data
)
}

default:
fatalError("Unprocessable value \(value) with key \(key)")
}
Expand Down
6 changes: 1 addition & 5 deletions samples/client/petstore/swift5/oneOf/PetstoreClient/Classes/OpenAPIs/Extensions.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,7 @@ extension Date: JSONEncodable {

extension JSONEncodable where Self: Encodable {
func encodeToJSON() -> Any {
let encoder = CodableHelper.jsonEncoder
guard let data = try? encoder.encode(self) else {
fatalError("Could not encode to json: \(self)")
}
return data.encodeToJSON()
return self
}
}

Expand Down
11 changes: 11 additions & 0 deletions ...ent/petstore/swift5/oneOf/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -486,6 +486,17 @@ private class FormDataEncoding: ParameterEncoding {
data: data
)

case let jsonEncodable as JSONEncodable:

if let data = try? CodableHelper.jsonEncoder.encode(jsonEncodable) {
urlRequest = configureDataUploadRequest(
urlRequest: urlRequest,
boundary: boundary,
name: key,
data: data
)
}

default:
fatalError("Unprocessable value \(value) with key \(key)")
}
Expand Down
6 changes: 1 addition & 5 deletions ...client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,7 @@ extension Date: JSONEncodable {

extension JSONEncodable where Self: Encodable {
func encodeToJSON() -> Any {
let encoder = CodableHelper.jsonEncoder
guard let data = try? encoder.encode(self) else {
fatalError("Could not encode to json: \(self)")
}
return data.encodeToJSON()
return self
}
}

Expand Down
Loading

0 comments on commit 4647a79

Please sign in to comment.