mirror of
https://github.com/OpenAPITools/openapi-generator.git
synced 2025-12-09 17:56:11 +00:00
Merge remote-tracking branch 'origin/master' into 6.0.x
This commit is contained in:
William Cheng
@@ -65,6 +65,16 @@ 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()
|
||||
}
|
||||
}
|
||||
|
||||
extension String: CodingKey {
|
||||
|
||||
public var stringValue: String {
|
||||
|
||||
@@ -10,7 +10,7 @@ import Foundation
|
||||
import AnyCodable
|
||||
#endif
|
||||
|
||||
public struct AdditionalPropertiesClass: Codable, Hashable {
|
||||
public struct AdditionalPropertiesClass: Codable, JSONEncodable, Hashable {
|
||||
|
||||
public var mapString: [String: String]?
|
||||
public var mapMapString: [String: [String: String]]?
|
||||
|
||||
@@ -10,7 +10,7 @@ import Foundation
|
||||
import AnyCodable
|
||||
#endif
|
||||
|
||||
public struct Animal: Codable, Hashable {
|
||||
public struct Animal: Codable, JSONEncodable, Hashable {
|
||||
|
||||
public var className: String
|
||||
public var color: String? = "red"
|
||||
|
||||
@@ -10,7 +10,7 @@ import Foundation
|
||||
import AnyCodable
|
||||
#endif
|
||||
|
||||
public struct ApiResponse: Codable, Hashable {
|
||||
public struct ApiResponse: Codable, JSONEncodable, Hashable {
|
||||
|
||||
public var code: Int?
|
||||
public var type: String?
|
||||
|
||||
@@ -10,7 +10,7 @@ import Foundation
|
||||
import AnyCodable
|
||||
#endif
|
||||
|
||||
public struct ArrayOfArrayOfNumberOnly: Codable, Hashable {
|
||||
public struct ArrayOfArrayOfNumberOnly: Codable, JSONEncodable, Hashable {
|
||||
|
||||
public var arrayArrayNumber: [[Double]]?
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ import Foundation
|
||||
import AnyCodable
|
||||
#endif
|
||||
|
||||
public struct ArrayOfNumberOnly: Codable, Hashable {
|
||||
public struct ArrayOfNumberOnly: Codable, JSONEncodable, Hashable {
|
||||
|
||||
public var arrayNumber: [Double]?
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ import Foundation
|
||||
import AnyCodable
|
||||
#endif
|
||||
|
||||
public struct ArrayTest: Codable, Hashable {
|
||||
public struct ArrayTest: Codable, JSONEncodable, Hashable {
|
||||
|
||||
public var arrayOfString: [String]?
|
||||
public var arrayArrayOfInteger: [[Int64]]?
|
||||
|
||||
@@ -10,7 +10,7 @@ import Foundation
|
||||
import AnyCodable
|
||||
#endif
|
||||
|
||||
public struct Capitalization: Codable, Hashable {
|
||||
public struct Capitalization: Codable, JSONEncodable, Hashable {
|
||||
|
||||
public var smallCamel: String?
|
||||
public var capitalCamel: String?
|
||||
|
||||
@@ -10,7 +10,7 @@ import Foundation
|
||||
import AnyCodable
|
||||
#endif
|
||||
|
||||
public struct Cat: Codable, Hashable {
|
||||
public struct Cat: Codable, JSONEncodable, Hashable {
|
||||
|
||||
public var className: String
|
||||
public var color: String? = "red"
|
||||
|
||||
@@ -10,7 +10,7 @@ import Foundation
|
||||
import AnyCodable
|
||||
#endif
|
||||
|
||||
public struct CatAllOf: Codable, Hashable {
|
||||
public struct CatAllOf: Codable, JSONEncodable, Hashable {
|
||||
|
||||
public var declawed: Bool?
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ import Foundation
|
||||
import AnyCodable
|
||||
#endif
|
||||
|
||||
public struct Category: Codable, Hashable {
|
||||
public struct Category: Codable, JSONEncodable, Hashable {
|
||||
|
||||
public var id: Int64?
|
||||
public var name: String? = "default-name"
|
||||
|
||||
@@ -11,7 +11,7 @@ import AnyCodable
|
||||
#endif
|
||||
|
||||
/** Model for testing model with \"_class\" property */
|
||||
public struct ClassModel: Codable, Hashable {
|
||||
public struct ClassModel: Codable, JSONEncodable, Hashable {
|
||||
|
||||
public var _class: String?
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ import Foundation
|
||||
import AnyCodable
|
||||
#endif
|
||||
|
||||
public struct Client: Codable, Hashable {
|
||||
public struct Client: Codable, JSONEncodable, Hashable {
|
||||
|
||||
public var client: String?
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ import Foundation
|
||||
import AnyCodable
|
||||
#endif
|
||||
|
||||
public struct Dog: Codable, Hashable {
|
||||
public struct Dog: Codable, JSONEncodable, Hashable {
|
||||
|
||||
public var className: String
|
||||
public var color: String? = "red"
|
||||
|
||||
@@ -10,7 +10,7 @@ import Foundation
|
||||
import AnyCodable
|
||||
#endif
|
||||
|
||||
public struct DogAllOf: Codable, Hashable {
|
||||
public struct DogAllOf: Codable, JSONEncodable, Hashable {
|
||||
|
||||
public var breed: String?
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ import Foundation
|
||||
import AnyCodable
|
||||
#endif
|
||||
|
||||
public struct EnumArrays: Codable, Hashable {
|
||||
public struct EnumArrays: Codable, JSONEncodable, Hashable {
|
||||
|
||||
public enum JustSymbol: String, Codable, CaseIterable {
|
||||
case greaterThanOrEqualTo = ">="
|
||||
|
||||
@@ -10,7 +10,7 @@ import Foundation
|
||||
import AnyCodable
|
||||
#endif
|
||||
|
||||
public struct EnumTest: Codable, Hashable {
|
||||
public struct EnumTest: Codable, JSONEncodable, Hashable {
|
||||
|
||||
public enum EnumString: String, Codable, CaseIterable {
|
||||
case upper = "UPPER"
|
||||
|
||||
@@ -11,7 +11,7 @@ import AnyCodable
|
||||
#endif
|
||||
|
||||
/** Must be named `File` for test. */
|
||||
public struct File: Codable, Hashable {
|
||||
public struct File: Codable, JSONEncodable, Hashable {
|
||||
|
||||
/** Test capitalization */
|
||||
public var sourceURI: String?
|
||||
|
||||
@@ -10,7 +10,7 @@ import Foundation
|
||||
import AnyCodable
|
||||
#endif
|
||||
|
||||
public struct FileSchemaTestClass: Codable, Hashable {
|
||||
public struct FileSchemaTestClass: Codable, JSONEncodable, Hashable {
|
||||
|
||||
public var file: File?
|
||||
public var files: [File]?
|
||||
|
||||
@@ -10,7 +10,7 @@ import Foundation
|
||||
import AnyCodable
|
||||
#endif
|
||||
|
||||
public struct FormatTest: Codable, Hashable {
|
||||
public struct FormatTest: Codable, JSONEncodable, Hashable {
|
||||
|
||||
public var integer: Int?
|
||||
public var int32: Int?
|
||||
|
||||
@@ -10,7 +10,7 @@ import Foundation
|
||||
import AnyCodable
|
||||
#endif
|
||||
|
||||
public struct HasOnlyReadOnly: Codable, Hashable {
|
||||
public struct HasOnlyReadOnly: Codable, JSONEncodable, Hashable {
|
||||
|
||||
public var bar: String?
|
||||
public var foo: String?
|
||||
|
||||
@@ -10,7 +10,7 @@ import Foundation
|
||||
import AnyCodable
|
||||
#endif
|
||||
|
||||
public struct List: Codable, Hashable {
|
||||
public struct List: Codable, JSONEncodable, Hashable {
|
||||
|
||||
public var _123list: String?
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ import Foundation
|
||||
import AnyCodable
|
||||
#endif
|
||||
|
||||
public struct MapTest: Codable, Hashable {
|
||||
public struct MapTest: Codable, JSONEncodable, Hashable {
|
||||
|
||||
public enum MapOfEnumString: String, Codable, CaseIterable {
|
||||
case upper = "UPPER"
|
||||
|
||||
@@ -10,7 +10,7 @@ import Foundation
|
||||
import AnyCodable
|
||||
#endif
|
||||
|
||||
public struct MixedPropertiesAndAdditionalPropertiesClass: Codable, Hashable {
|
||||
public struct MixedPropertiesAndAdditionalPropertiesClass: Codable, JSONEncodable, Hashable {
|
||||
|
||||
public var uuid: UUID?
|
||||
public var dateTime: Date?
|
||||
|
||||
@@ -11,7 +11,7 @@ import AnyCodable
|
||||
#endif
|
||||
|
||||
/** Model for testing model name starting with number */
|
||||
public struct Model200Response: Codable, Hashable {
|
||||
public struct Model200Response: Codable, JSONEncodable, Hashable {
|
||||
|
||||
public var name: Int?
|
||||
public var _class: String?
|
||||
|
||||
@@ -11,7 +11,7 @@ import AnyCodable
|
||||
#endif
|
||||
|
||||
/** Model for testing model name same as property name */
|
||||
public struct Name: Codable, Hashable {
|
||||
public struct Name: Codable, JSONEncodable, Hashable {
|
||||
|
||||
public var name: Int
|
||||
public var snakeCase: NullEncodable<Int> = .encodeValue(11033)
|
||||
|
||||
@@ -10,7 +10,7 @@ import Foundation
|
||||
import AnyCodable
|
||||
#endif
|
||||
|
||||
public struct NumberOnly: Codable, Hashable {
|
||||
public struct NumberOnly: Codable, JSONEncodable, Hashable {
|
||||
|
||||
public var justNumber: Double?
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ import Foundation
|
||||
import AnyCodable
|
||||
#endif
|
||||
|
||||
public struct Order: Codable, Hashable {
|
||||
public struct Order: Codable, JSONEncodable, Hashable {
|
||||
|
||||
public enum Status: String, Codable, CaseIterable {
|
||||
case placed = "placed"
|
||||
|
||||
@@ -10,7 +10,7 @@ import Foundation
|
||||
import AnyCodable
|
||||
#endif
|
||||
|
||||
public struct OuterComposite: Codable, Hashable {
|
||||
public struct OuterComposite: Codable, JSONEncodable, Hashable {
|
||||
|
||||
public var myNumber: Double?
|
||||
public var myString: String?
|
||||
|
||||
@@ -10,7 +10,7 @@ import Foundation
|
||||
import AnyCodable
|
||||
#endif
|
||||
|
||||
public struct Pet: Codable, Hashable {
|
||||
public struct Pet: Codable, JSONEncodable, Hashable {
|
||||
|
||||
public enum Status: String, Codable, CaseIterable {
|
||||
case available = "available"
|
||||
|
||||
@@ -10,7 +10,7 @@ import Foundation
|
||||
import AnyCodable
|
||||
#endif
|
||||
|
||||
public struct ReadOnlyFirst: Codable, Hashable {
|
||||
public struct ReadOnlyFirst: Codable, JSONEncodable, Hashable {
|
||||
|
||||
public var bar: String?
|
||||
public var baz: String?
|
||||
|
||||
@@ -11,7 +11,7 @@ import AnyCodable
|
||||
#endif
|
||||
|
||||
/** Model for testing reserved words */
|
||||
public struct Return: Codable, Hashable {
|
||||
public struct Return: Codable, JSONEncodable, Hashable {
|
||||
|
||||
public var _return: Int?
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ import Foundation
|
||||
import AnyCodable
|
||||
#endif
|
||||
|
||||
public struct SpecialModelName: Codable, Hashable {
|
||||
public struct SpecialModelName: Codable, JSONEncodable, Hashable {
|
||||
|
||||
public var specialPropertyName: Int64?
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ import Foundation
|
||||
import AnyCodable
|
||||
#endif
|
||||
|
||||
public struct StringBooleanMap: Codable, Hashable {
|
||||
public struct StringBooleanMap: Codable, JSONEncodable, Hashable {
|
||||
|
||||
|
||||
public enum CodingKeys: CodingKey, CaseIterable {
|
||||
|
||||
@@ -10,7 +10,7 @@ import Foundation
|
||||
import AnyCodable
|
||||
#endif
|
||||
|
||||
public struct Tag: Codable, Hashable {
|
||||
public struct Tag: Codable, JSONEncodable, Hashable {
|
||||
|
||||
public var id: Int64?
|
||||
public var name: String?
|
||||
|
||||
@@ -10,7 +10,7 @@ import Foundation
|
||||
import AnyCodable
|
||||
#endif
|
||||
|
||||
public struct TypeHolderDefault: Codable, Hashable {
|
||||
public struct TypeHolderDefault: Codable, JSONEncodable, Hashable {
|
||||
|
||||
public var stringItem: String = "what"
|
||||
public var numberItem: Double
|
||||
|
||||
@@ -10,7 +10,7 @@ import Foundation
|
||||
import AnyCodable
|
||||
#endif
|
||||
|
||||
public struct TypeHolderExample: Codable, Hashable {
|
||||
public struct TypeHolderExample: Codable, JSONEncodable, Hashable {
|
||||
|
||||
public var stringItem: String
|
||||
public var numberItem: Double
|
||||
|
||||
@@ -10,7 +10,7 @@ import Foundation
|
||||
import AnyCodable
|
||||
#endif
|
||||
|
||||
public struct User: Codable, Hashable {
|
||||
public struct User: Codable, JSONEncodable, Hashable {
|
||||
|
||||
public var id: Int64?
|
||||
public var username: String?
|
||||
|
||||
Reference in New Issue
Block a user