[Swift5][client] try to fix JsonEncondable

4brunu · 4brunu · commit 4647a799be61 · 2022-02-07T16:56:23.000Z
diff --git a/modules/openapi-generator/src/main/resources/swift5/Extensions.mustache b/modules/openapi-generator/src/main/resources/swift5/Extensions.mustache
@@ -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}}
 
diff --git a/modules/openapi-generator/src/main/resources/swift5/libraries/alamofire/AlamofireImplementations.mustache b/modules/openapi-generator/src/main/resources/swift5/libraries/alamofire/AlamofireImplementations.mustache
@@ -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)
diff --git a/modules/openapi-generator/src/main/resources/swift5/libraries/urlsession/URLSessionImplementations.mustache b/modules/openapi-generator/src/main/resources/swift5/libraries/urlsession/URLSessionImplementations.mustache
@@ -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)")
             }
diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift
@@ -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)
diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift
@@ -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
     }
 }
 
diff --git a/samples/client/petstore/swift5/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift5/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift
@@ -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
     }
 }
 
diff --git a/samples/client/petstore/swift5/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift5/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift
@@ -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)")
             }
diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift
@@ -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
     }
 }
 
diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift
@@ -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)")
             }
diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Extensions.swift
@@ -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
     }
 }
 
diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift
@@ -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)")
             }
diff --git a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/Extensions.swift
@@ -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
     }
 }
 
diff --git a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift
@@ -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)")
             }
diff --git a/samples/client/petstore/swift5/frozenEnums/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift5/frozenEnums/PetstoreClient/Classes/OpenAPIs/Extensions.swift
@@ -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
     }
 }
 
diff --git a/samples/client/petstore/swift5/frozenEnums/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift5/frozenEnums/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift
@@ -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)")
             }
diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Extensions.swift
@@ -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
     }
 }
 
diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift
@@ -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)")
             }
diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Extensions.swift
@@ -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
     }
 }
 
diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift
@@ -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)")
             }
diff --git a/samples/client/petstore/swift5/oneOf/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift5/oneOf/PetstoreClient/Classes/OpenAPIs/Extensions.swift
@@ -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
     }
 }
 
diff --git a/samples/client/petstore/swift5/oneOf/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift5/oneOf/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift
@@ -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)")
             }
diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift
@@ -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
     }
 }
 
diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift
diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Extensions.swift
diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift
diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift
diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift
diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift
diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift
diff --git a/samples/client/petstore/swift5/urlsessionLibrary/Sources/PetstoreClient/Extensions.swift b/samples/client/petstore/swift5/urlsessionLibrary/Sources/PetstoreClient/Extensions.swift
diff --git a/samples/client/petstore/swift5/urlsessionLibrary/Sources/PetstoreClient/URLSessionImplementations.swift b/samples/client/petstore/swift5/urlsessionLibrary/Sources/PetstoreClient/URLSessionImplementations.swift
diff --git a/samples/client/petstore/swift5/x-swift-hashable/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift5/x-swift-hashable/PetstoreClient/Classes/OpenAPIs/Extensions.swift
diff --git a/samples/client/petstore/swift5/x-swift-hashable/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift5/x-swift-hashable/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift

Original file line number	Diff line number	Diff line change
`@@ -67,11 +67,7 @@ extension Date: JSONEncodable {`
`67`	`67`
`68`	`68`	`extension JSONEncodable where Self: Encodable {`
`69`	`69`	`func encodeToJSON() -> Any {`
`70`		`- let encoder = CodableHelper.jsonEncoder`
`71`		`- guard let data = try? encoder.encode(self) else {`
`72`		`- fatalError("Could not encode to json: \(self)")`
`73`		`- }`
`74`		`- return data.encodeToJSON()`
	`70`	`+ return self`
`75`	`71`	`}`
`76`	`72`	`}`
`77`	`73`