Don't extend JSONEncodable when using Vapor.

OpenAPITools · Jan 4, 2022 · ebd7d01 · ebd7d01
1 parent e55c757
commit ebd7d01
Showing 1 changed file with 12 additions and 11 deletions.
diff --git a/modules/openapi-generator/src/main/resources/swift5/Extensions.mustache b/modules/openapi-generator/src/main/resources/swift5/Extensions.mustache
@@ -65,7 +65,18 @@ extension Date: JSONEncodable {
     func encodeToJSON() -> Any {
         return CodableHelper.dateFormatter.string(from: self)
     }
-}{{/useVapor}}{{#generateModelAdditionalProperties}}
+}
+
+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()
+    }
+}
+{{/useVapor}}{{#generateModelAdditionalProperties}}
 
 extension String: CodingKey {
 
@@ -206,13 +217,3 @@ extension Set: RequestDecodable where Element: Content {
 extension Set: Content where Element: Content { }
 
 extension AnyCodable: Content {}{{/useVapor}}
-
-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()
-    }
-}