[Swift5] Fix Datetime default value (#7003)

* [Swift5] Fix Datetime default value

If a default value is provided by the API spec for a date-time attribute,
this commit fixes the generation code to build a correct Swift `Date` object.

* update samples with swiftlint

Co-authored-by: William Cheng <wing328hk@gmail.com>
This commit is contained in:
Alexandre 2020-07-24 05:56:18 +02:00 committed by GitHub
parent 8e150ab94e
commit 83f64dbc15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
349 changed files with 362 additions and 353 deletions

View File

@ -34,6 +34,10 @@ import java.io.File;
import java.util.*; import java.util.*;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import java.time.OffsetDateTime;
import java.time.Instant;
import java.time.temporal.ChronoField;
import java.util.concurrent.TimeUnit;
import static org.openapitools.codegen.utils.StringUtils.camelize; import static org.openapitools.codegen.utils.StringUtils.camelize;
@ -620,14 +624,19 @@ public class Swift5ClientCodegen extends DefaultCodegen implements CodegenConfig
} }
} }
} }
if (p.getDefault() != null) {
if (ModelUtils.isIntegerSchema(p) || ModelUtils.isNumberSchema(p) || ModelUtils.isBooleanSchema(p)) { if (ModelUtils.isIntegerSchema(p) || ModelUtils.isNumberSchema(p) || ModelUtils.isBooleanSchema(p)) {
if (p.getDefault() != null) {
return p.getDefault().toString(); return p.getDefault().toString();
} } else if (ModelUtils.isDateTimeSchema(p)) {
// Datetime time stamps in Swift are expressed as Seconds with Microsecond precision.
// In Java, we need to be creative to get the Timestamp in Microseconds as a long.
Instant instant = ((OffsetDateTime) p.getDefault()).toInstant();
long epochMicro = TimeUnit.SECONDS.toMicros(instant.getEpochSecond()) + ((long) instant.get(ChronoField.MICRO_OF_SECOND));
return "Date(timeIntervalSince1970: " + String.valueOf(epochMicro) + ".0 / 1_000_000)";
} else if (ModelUtils.isStringSchema(p)) { } else if (ModelUtils.isStringSchema(p)) {
if (p.getDefault() != null) {
return "\"" + escapeText((String) p.getDefault()) + "\""; return "\"" + escapeText((String) p.getDefault()) + "\"";
} }
// TODO: Handle more cases from `ModelUtils`, such as Date
} }
return null; return null;
} }

View File

@ -12,7 +12,7 @@ public struct AdditionalPropertiesClass: Codable {
public var mapString: [String: String]? public var mapString: [String: String]?
public var mapMapString: [String: [String: String]]? public var mapMapString: [String: [String: String]]?
public init(mapString: [String: String]?, mapMapString: [String: [String: String]]?) { public init(mapString: [String: String]? = nil, mapMapString: [String: [String: String]]? = nil) {
self.mapString = mapString self.mapString = mapString
self.mapMapString = mapMapString self.mapMapString = mapMapString
} }

View File

@ -12,7 +12,7 @@ public struct Animal: Codable {
public var className: String public var className: String
public var color: String? = "red" public var color: String? = "red"
public init(className: String, color: String?) { public init(className: String, color: String? = nil) {
self.className = className self.className = className
self.color = color self.color = color
} }

View File

@ -13,7 +13,7 @@ public struct ApiResponse: Codable {
public var type: String? public var type: String?
public var message: String? public var message: String?
public init(code: Int?, type: String?, message: String?) { public init(code: Int? = nil, type: String? = nil, message: String? = nil) {
self.code = code self.code = code
self.type = type self.type = type
self.message = message self.message = message

View File

@ -11,7 +11,7 @@ public struct ArrayOfArrayOfNumberOnly: Codable {
public var arrayArrayNumber: [[Double]]? public var arrayArrayNumber: [[Double]]?
public init(arrayArrayNumber: [[Double]]?) { public init(arrayArrayNumber: [[Double]]? = nil) {
self.arrayArrayNumber = arrayArrayNumber self.arrayArrayNumber = arrayArrayNumber
} }

View File

@ -11,7 +11,7 @@ public struct ArrayOfNumberOnly: Codable {
public var arrayNumber: [Double]? public var arrayNumber: [Double]?
public init(arrayNumber: [Double]?) { public init(arrayNumber: [Double]? = nil) {
self.arrayNumber = arrayNumber self.arrayNumber = arrayNumber
} }

View File

@ -13,7 +13,7 @@ public struct ArrayTest: Codable {
public var arrayArrayOfInteger: [[Int64]]? public var arrayArrayOfInteger: [[Int64]]?
public var arrayArrayOfModel: [[ReadOnlyFirst]]? public var arrayArrayOfModel: [[ReadOnlyFirst]]?
public init(arrayOfString: [String]?, arrayArrayOfInteger: [[Int64]]?, arrayArrayOfModel: [[ReadOnlyFirst]]?) { public init(arrayOfString: [String]? = nil, arrayArrayOfInteger: [[Int64]]? = nil, arrayArrayOfModel: [[ReadOnlyFirst]]? = nil) {
self.arrayOfString = arrayOfString self.arrayOfString = arrayOfString
self.arrayArrayOfInteger = arrayArrayOfInteger self.arrayArrayOfInteger = arrayArrayOfInteger
self.arrayArrayOfModel = arrayArrayOfModel self.arrayArrayOfModel = arrayArrayOfModel

View File

@ -17,7 +17,7 @@ public struct Capitalization: Codable {
/** Name of the pet */ /** Name of the pet */
public var ATT_NAME: String? public var ATT_NAME: String?
public init(smallCamel: String?, capitalCamel: String?, smallSnake: String?, capitalSnake: String?, sCAETHFlowPoints: String?, ATT_NAME: String?) { public init(smallCamel: String? = nil, capitalCamel: String? = nil, smallSnake: String? = nil, capitalSnake: String? = nil, sCAETHFlowPoints: String? = nil, ATT_NAME: String? = nil) {
self.smallCamel = smallCamel self.smallCamel = smallCamel
self.capitalCamel = capitalCamel self.capitalCamel = capitalCamel
self.smallSnake = smallSnake self.smallSnake = smallSnake

View File

@ -13,7 +13,7 @@ public struct Cat: Codable {
public var color: String? = "red" public var color: String? = "red"
public var declawed: Bool? public var declawed: Bool?
public init(className: String, color: String?, declawed: Bool?) { public init(className: String, color: String? = nil, declawed: Bool? = nil) {
self.className = className self.className = className
self.color = color self.color = color
self.declawed = declawed self.declawed = declawed

View File

@ -11,7 +11,7 @@ public struct CatAllOf: Codable {
public var declawed: Bool? public var declawed: Bool?
public init(declawed: Bool?) { public init(declawed: Bool? = nil) {
self.declawed = declawed self.declawed = declawed
} }

View File

@ -12,7 +12,7 @@ public struct Category: Codable {
public var id: Int64? public var id: Int64?
public var name: String = "default-name" public var name: String = "default-name"
public init(id: Int64?, name: String) { public init(id: Int64? = nil, name: String) {
self.id = id self.id = id
self.name = name self.name = name
} }

View File

@ -12,7 +12,7 @@ public struct ClassModel: Codable {
public var _class: String? public var _class: String?
public init(_class: String?) { public init(_class: String? = nil) {
self._class = _class self._class = _class
} }

View File

@ -11,7 +11,7 @@ public struct Client: Codable {
public var client: String? public var client: String?
public init(client: String?) { public init(client: String? = nil) {
self.client = client self.client = client
} }

View File

@ -13,7 +13,7 @@ public struct Dog: Codable {
public var color: String? = "red" public var color: String? = "red"
public var breed: String? public var breed: String?
public init(className: String, color: String?, breed: String?) { public init(className: String, color: String? = nil, breed: String? = nil) {
self.className = className self.className = className
self.color = color self.color = color
self.breed = breed self.breed = breed

View File

@ -11,7 +11,7 @@ public struct DogAllOf: Codable {
public var breed: String? public var breed: String?
public init(breed: String?) { public init(breed: String? = nil) {
self.breed = breed self.breed = breed
} }

View File

@ -20,7 +20,7 @@ public struct EnumArrays: Codable {
public var justSymbol: JustSymbol? public var justSymbol: JustSymbol?
public var arrayEnum: [ArrayEnum]? public var arrayEnum: [ArrayEnum]?
public init(justSymbol: JustSymbol?, arrayEnum: [ArrayEnum]?) { public init(justSymbol: JustSymbol? = nil, arrayEnum: [ArrayEnum]? = nil) {
self.justSymbol = justSymbol self.justSymbol = justSymbol
self.arrayEnum = arrayEnum self.arrayEnum = arrayEnum
} }

View File

@ -33,7 +33,7 @@ public struct EnumTest: Codable {
public var enumNumber: EnumNumber? public var enumNumber: EnumNumber?
public var outerEnum: OuterEnum? public var outerEnum: OuterEnum?
public init(enumString: EnumString?, enumStringRequired: EnumStringRequired, enumInteger: EnumInteger?, enumNumber: EnumNumber?, outerEnum: OuterEnum?) { public init(enumString: EnumString? = nil, enumStringRequired: EnumStringRequired, enumInteger: EnumInteger? = nil, enumNumber: EnumNumber? = nil, outerEnum: OuterEnum? = nil) {
self.enumString = enumString self.enumString = enumString
self.enumStringRequired = enumStringRequired self.enumStringRequired = enumStringRequired
self.enumInteger = enumInteger self.enumInteger = enumInteger

View File

@ -13,7 +13,7 @@ public struct File: Codable {
/** Test capitalization */ /** Test capitalization */
public var sourceURI: String? public var sourceURI: String?
public init(sourceURI: String?) { public init(sourceURI: String? = nil) {
self.sourceURI = sourceURI self.sourceURI = sourceURI
} }

View File

@ -12,7 +12,7 @@ public struct FileSchemaTestClass: Codable {
public var file: File? public var file: File?
public var files: [File]? public var files: [File]?
public init(file: File?, files: [File]?) { public init(file: File? = nil, files: [File]? = nil) {
self.file = file self.file = file
self.files = files self.files = files
} }

View File

@ -23,7 +23,7 @@ public struct FormatTest: Codable {
public var uuid: UUID? public var uuid: UUID?
public var password: String public var password: String
public init(integer: Int?, int32: Int?, int64: Int64?, number: Double, float: Float?, double: Double?, string: String?, byte: Data, binary: URL?, date: Date, dateTime: Date?, uuid: UUID?, password: String) { public init(integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, number: Double, float: Float? = nil, double: Double? = nil, string: String? = nil, byte: Data, binary: URL? = nil, date: Date, dateTime: Date? = nil, uuid: UUID? = nil, password: String) {
self.integer = integer self.integer = integer
self.int32 = int32 self.int32 = int32
self.int64 = int64 self.int64 = int64

View File

@ -12,7 +12,7 @@ public struct HasOnlyReadOnly: Codable {
public var bar: String? public var bar: String?
public var foo: String? public var foo: String?
public init(bar: String?, foo: String?) { public init(bar: String? = nil, foo: String? = nil) {
self.bar = bar self.bar = bar
self.foo = foo self.foo = foo
} }

View File

@ -11,7 +11,7 @@ public struct List: Codable {
public var _123list: String? public var _123list: String?
public init(_123list: String?) { public init(_123list: String? = nil) {
self._123list = _123list self._123list = _123list
} }

View File

@ -18,7 +18,7 @@ public struct MapTest: Codable {
public var directMap: [String: Bool]? public var directMap: [String: Bool]?
public var indirectMap: StringBooleanMap? public var indirectMap: StringBooleanMap?
public init(mapMapOfString: [String: [String: String]]?, mapOfEnumString: [String: String]?, directMap: [String: Bool]?, indirectMap: StringBooleanMap?) { public init(mapMapOfString: [String: [String: String]]? = nil, mapOfEnumString: [String: String]? = nil, directMap: [String: Bool]? = nil, indirectMap: StringBooleanMap? = nil) {
self.mapMapOfString = mapMapOfString self.mapMapOfString = mapMapOfString
self.mapOfEnumString = mapOfEnumString self.mapOfEnumString = mapOfEnumString
self.directMap = directMap self.directMap = directMap

View File

@ -13,7 +13,7 @@ public struct MixedPropertiesAndAdditionalPropertiesClass: Codable {
public var dateTime: Date? public var dateTime: Date?
public var map: [String: Animal]? public var map: [String: Animal]?
public init(uuid: UUID?, dateTime: Date?, map: [String: Animal]?) { public init(uuid: UUID? = nil, dateTime: Date? = nil, map: [String: Animal]? = nil) {
self.uuid = uuid self.uuid = uuid
self.dateTime = dateTime self.dateTime = dateTime
self.map = map self.map = map

View File

@ -13,7 +13,7 @@ public struct Model200Response: Codable {
public var name: Int? public var name: Int?
public var _class: String? public var _class: String?
public init(name: Int?, _class: String?) { public init(name: Int? = nil, _class: String? = nil) {
self.name = name self.name = name
self._class = _class self._class = _class
} }

View File

@ -15,7 +15,7 @@ public struct Name: Codable {
public var property: String? public var property: String?
public var _123number: Int? public var _123number: Int?
public init(name: Int, snakeCase: Int?, property: String?, _123number: Int?) { public init(name: Int, snakeCase: Int? = nil, property: String? = nil, _123number: Int? = nil) {
self.name = name self.name = name
self.snakeCase = snakeCase self.snakeCase = snakeCase
self.property = property self.property = property

View File

@ -11,7 +11,7 @@ public struct NumberOnly: Codable {
public var justNumber: Double? public var justNumber: Double?
public init(justNumber: Double?) { public init(justNumber: Double? = nil) {
self.justNumber = justNumber self.justNumber = justNumber
} }

View File

@ -22,7 +22,7 @@ public struct Order: Codable {
public var status: Status? public var status: Status?
public var complete: Bool? = false public var complete: Bool? = false
public init(id: Int64?, petId: Int64?, quantity: Int?, shipDate: Date?, status: Status?, complete: Bool?) { public init(id: Int64? = nil, petId: Int64? = nil, quantity: Int? = nil, shipDate: Date? = nil, status: Status? = nil, complete: Bool? = nil) {
self.id = id self.id = id
self.petId = petId self.petId = petId
self.quantity = quantity self.quantity = quantity

View File

@ -13,7 +13,7 @@ public struct OuterComposite: Codable {
public var myString: String? public var myString: String?
public var myBoolean: Bool? public var myBoolean: Bool?
public init(myNumber: Double?, myString: String?, myBoolean: Bool?) { public init(myNumber: Double? = nil, myString: String? = nil, myBoolean: Bool? = nil) {
self.myNumber = myNumber self.myNumber = myNumber
self.myString = myString self.myString = myString
self.myBoolean = myBoolean self.myBoolean = myBoolean

View File

@ -22,7 +22,7 @@ public struct Pet: Codable {
/** pet status in the store */ /** pet status in the store */
public var status: Status? public var status: Status?
public init(id: Int64?, category: Category?, name: String, photoUrls: [String], tags: [Tag]?, status: Status?) { public init(id: Int64? = nil, category: Category? = nil, name: String, photoUrls: [String], tags: [Tag]? = nil, status: Status? = nil) {
self.id = id self.id = id
self.category = category self.category = category
self.name = name self.name = name

View File

@ -12,7 +12,7 @@ public struct ReadOnlyFirst: Codable {
public var bar: String? public var bar: String?
public var baz: String? public var baz: String?
public init(bar: String?, baz: String?) { public init(bar: String? = nil, baz: String? = nil) {
self.bar = bar self.bar = bar
self.baz = baz self.baz = baz
} }

View File

@ -12,7 +12,7 @@ public struct Return: Codable {
public var _return: Int? public var _return: Int?
public init(_return: Int?) { public init(_return: Int? = nil) {
self._return = _return self._return = _return
} }

View File

@ -11,7 +11,7 @@ public struct SpecialModelName: Codable {
public var specialPropertyName: Int64? public var specialPropertyName: Int64?
public init(specialPropertyName: Int64?) { public init(specialPropertyName: Int64? = nil) {
self.specialPropertyName = specialPropertyName self.specialPropertyName = specialPropertyName
} }

View File

@ -12,7 +12,7 @@ public struct Tag: Codable {
public var id: Int64? public var id: Int64?
public var name: String? public var name: String?
public init(id: Int64?, name: String?) { public init(id: Int64? = nil, name: String? = nil) {
self.id = id self.id = id
self.name = name self.name = name
} }

View File

@ -19,7 +19,7 @@ public struct User: Codable {
/** User Status */ /** User Status */
public var userStatus: Int? public var userStatus: Int?
public init(id: Int64?, username: String?, firstName: String?, lastName: String?, email: String?, password: String?, phone: String?, userStatus: Int?) { public init(id: Int64? = nil, username: String? = nil, firstName: String? = nil, lastName: String? = nil, email: String? = nil, password: String? = nil, phone: String? = nil, userStatus: Int? = nil) {
self.id = id self.id = id
self.username = username self.username = username
self.firstName = firstName self.firstName = firstName

View File

@ -12,7 +12,7 @@ public struct AdditionalPropertiesClass: Codable {
public var mapString: [String: String]? public var mapString: [String: String]?
public var mapMapString: [String: [String: String]]? public var mapMapString: [String: [String: String]]?
public init(mapString: [String: String]?, mapMapString: [String: [String: String]]?) { public init(mapString: [String: String]? = nil, mapMapString: [String: [String: String]]? = nil) {
self.mapString = mapString self.mapString = mapString
self.mapMapString = mapMapString self.mapMapString = mapMapString
} }

View File

@ -12,7 +12,7 @@ public struct Animal: Codable {
public var className: String public var className: String
public var color: String? = "red" public var color: String? = "red"
public init(className: String, color: String?) { public init(className: String, color: String? = nil) {
self.className = className self.className = className
self.color = color self.color = color
} }

View File

@ -13,7 +13,7 @@ public struct ApiResponse: Codable {
public var type: String? public var type: String?
public var message: String? public var message: String?
public init(code: Int?, type: String?, message: String?) { public init(code: Int? = nil, type: String? = nil, message: String? = nil) {
self.code = code self.code = code
self.type = type self.type = type
self.message = message self.message = message

View File

@ -11,7 +11,7 @@ public struct ArrayOfArrayOfNumberOnly: Codable {
public var arrayArrayNumber: [[Double]]? public var arrayArrayNumber: [[Double]]?
public init(arrayArrayNumber: [[Double]]?) { public init(arrayArrayNumber: [[Double]]? = nil) {
self.arrayArrayNumber = arrayArrayNumber self.arrayArrayNumber = arrayArrayNumber
} }

View File

@ -11,7 +11,7 @@ public struct ArrayOfNumberOnly: Codable {
public var arrayNumber: [Double]? public var arrayNumber: [Double]?
public init(arrayNumber: [Double]?) { public init(arrayNumber: [Double]? = nil) {
self.arrayNumber = arrayNumber self.arrayNumber = arrayNumber
} }

View File

@ -13,7 +13,7 @@ public struct ArrayTest: Codable {
public var arrayArrayOfInteger: [[Int64]]? public var arrayArrayOfInteger: [[Int64]]?
public var arrayArrayOfModel: [[ReadOnlyFirst]]? public var arrayArrayOfModel: [[ReadOnlyFirst]]?
public init(arrayOfString: [String]?, arrayArrayOfInteger: [[Int64]]?, arrayArrayOfModel: [[ReadOnlyFirst]]?) { public init(arrayOfString: [String]? = nil, arrayArrayOfInteger: [[Int64]]? = nil, arrayArrayOfModel: [[ReadOnlyFirst]]? = nil) {
self.arrayOfString = arrayOfString self.arrayOfString = arrayOfString
self.arrayArrayOfInteger = arrayArrayOfInteger self.arrayArrayOfInteger = arrayArrayOfInteger
self.arrayArrayOfModel = arrayArrayOfModel self.arrayArrayOfModel = arrayArrayOfModel

View File

@ -17,7 +17,7 @@ public struct Capitalization: Codable {
/** Name of the pet */ /** Name of the pet */
public var ATT_NAME: String? public var ATT_NAME: String?
public init(smallCamel: String?, capitalCamel: String?, smallSnake: String?, capitalSnake: String?, sCAETHFlowPoints: String?, ATT_NAME: String?) { public init(smallCamel: String? = nil, capitalCamel: String? = nil, smallSnake: String? = nil, capitalSnake: String? = nil, sCAETHFlowPoints: String? = nil, ATT_NAME: String? = nil) {
self.smallCamel = smallCamel self.smallCamel = smallCamel
self.capitalCamel = capitalCamel self.capitalCamel = capitalCamel
self.smallSnake = smallSnake self.smallSnake = smallSnake

View File

@ -13,7 +13,7 @@ public struct Cat: Codable {
public var color: String? = "red" public var color: String? = "red"
public var declawed: Bool? public var declawed: Bool?
public init(className: String, color: String?, declawed: Bool?) { public init(className: String, color: String? = nil, declawed: Bool? = nil) {
self.className = className self.className = className
self.color = color self.color = color
self.declawed = declawed self.declawed = declawed

View File

@ -11,7 +11,7 @@ public struct CatAllOf: Codable {
public var declawed: Bool? public var declawed: Bool?
public init(declawed: Bool?) { public init(declawed: Bool? = nil) {
self.declawed = declawed self.declawed = declawed
} }

View File

@ -12,7 +12,7 @@ public struct Category: Codable {
public var id: Int64? public var id: Int64?
public var name: String = "default-name" public var name: String = "default-name"
public init(id: Int64?, name: String) { public init(id: Int64? = nil, name: String) {
self.id = id self.id = id
self.name = name self.name = name
} }

View File

@ -12,7 +12,7 @@ public struct ClassModel: Codable {
public var _class: String? public var _class: String?
public init(_class: String?) { public init(_class: String? = nil) {
self._class = _class self._class = _class
} }

View File

@ -11,7 +11,7 @@ public struct Client: Codable {
public var client: String? public var client: String?
public init(client: String?) { public init(client: String? = nil) {
self.client = client self.client = client
} }

View File

@ -13,7 +13,7 @@ public struct Dog: Codable {
public var color: String? = "red" public var color: String? = "red"
public var breed: String? public var breed: String?
public init(className: String, color: String?, breed: String?) { public init(className: String, color: String? = nil, breed: String? = nil) {
self.className = className self.className = className
self.color = color self.color = color
self.breed = breed self.breed = breed

View File

@ -11,7 +11,7 @@ public struct DogAllOf: Codable {
public var breed: String? public var breed: String?
public init(breed: String?) { public init(breed: String? = nil) {
self.breed = breed self.breed = breed
} }

View File

@ -20,7 +20,7 @@ public struct EnumArrays: Codable {
public var justSymbol: JustSymbol? public var justSymbol: JustSymbol?
public var arrayEnum: [ArrayEnum]? public var arrayEnum: [ArrayEnum]?
public init(justSymbol: JustSymbol?, arrayEnum: [ArrayEnum]?) { public init(justSymbol: JustSymbol? = nil, arrayEnum: [ArrayEnum]? = nil) {
self.justSymbol = justSymbol self.justSymbol = justSymbol
self.arrayEnum = arrayEnum self.arrayEnum = arrayEnum
} }

View File

@ -33,7 +33,7 @@ public struct EnumTest: Codable {
public var enumNumber: EnumNumber? public var enumNumber: EnumNumber?
public var outerEnum: OuterEnum? public var outerEnum: OuterEnum?
public init(enumString: EnumString?, enumStringRequired: EnumStringRequired, enumInteger: EnumInteger?, enumNumber: EnumNumber?, outerEnum: OuterEnum?) { public init(enumString: EnumString? = nil, enumStringRequired: EnumStringRequired, enumInteger: EnumInteger? = nil, enumNumber: EnumNumber? = nil, outerEnum: OuterEnum? = nil) {
self.enumString = enumString self.enumString = enumString
self.enumStringRequired = enumStringRequired self.enumStringRequired = enumStringRequired
self.enumInteger = enumInteger self.enumInteger = enumInteger

View File

@ -13,7 +13,7 @@ public struct File: Codable {
/** Test capitalization */ /** Test capitalization */
public var sourceURI: String? public var sourceURI: String?
public init(sourceURI: String?) { public init(sourceURI: String? = nil) {
self.sourceURI = sourceURI self.sourceURI = sourceURI
} }

View File

@ -12,7 +12,7 @@ public struct FileSchemaTestClass: Codable {
public var file: File? public var file: File?
public var files: [File]? public var files: [File]?
public init(file: File?, files: [File]?) { public init(file: File? = nil, files: [File]? = nil) {
self.file = file self.file = file
self.files = files self.files = files
} }

View File

@ -23,7 +23,7 @@ public struct FormatTest: Codable {
public var uuid: UUID? public var uuid: UUID?
public var password: String public var password: String
public init(integer: Int?, int32: Int?, int64: Int64?, number: Double, float: Float?, double: Double?, string: String?, byte: Data, binary: URL?, date: Date, dateTime: Date?, uuid: UUID?, password: String) { public init(integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, number: Double, float: Float? = nil, double: Double? = nil, string: String? = nil, byte: Data, binary: URL? = nil, date: Date, dateTime: Date? = nil, uuid: UUID? = nil, password: String) {
self.integer = integer self.integer = integer
self.int32 = int32 self.int32 = int32
self.int64 = int64 self.int64 = int64

View File

@ -12,7 +12,7 @@ public struct HasOnlyReadOnly: Codable {
public var bar: String? public var bar: String?
public var foo: String? public var foo: String?
public init(bar: String?, foo: String?) { public init(bar: String? = nil, foo: String? = nil) {
self.bar = bar self.bar = bar
self.foo = foo self.foo = foo
} }

View File

@ -11,7 +11,7 @@ public struct List: Codable {
public var _123list: String? public var _123list: String?
public init(_123list: String?) { public init(_123list: String? = nil) {
self._123list = _123list self._123list = _123list
} }

View File

@ -18,7 +18,7 @@ public struct MapTest: Codable {
public var directMap: [String: Bool]? public var directMap: [String: Bool]?
public var indirectMap: StringBooleanMap? public var indirectMap: StringBooleanMap?
public init(mapMapOfString: [String: [String: String]]?, mapOfEnumString: [String: String]?, directMap: [String: Bool]?, indirectMap: StringBooleanMap?) { public init(mapMapOfString: [String: [String: String]]? = nil, mapOfEnumString: [String: String]? = nil, directMap: [String: Bool]? = nil, indirectMap: StringBooleanMap? = nil) {
self.mapMapOfString = mapMapOfString self.mapMapOfString = mapMapOfString
self.mapOfEnumString = mapOfEnumString self.mapOfEnumString = mapOfEnumString
self.directMap = directMap self.directMap = directMap

View File

@ -13,7 +13,7 @@ public struct MixedPropertiesAndAdditionalPropertiesClass: Codable {
public var dateTime: Date? public var dateTime: Date?
public var map: [String: Animal]? public var map: [String: Animal]?
public init(uuid: UUID?, dateTime: Date?, map: [String: Animal]?) { public init(uuid: UUID? = nil, dateTime: Date? = nil, map: [String: Animal]? = nil) {
self.uuid = uuid self.uuid = uuid
self.dateTime = dateTime self.dateTime = dateTime
self.map = map self.map = map

View File

@ -13,7 +13,7 @@ public struct Model200Response: Codable {
public var name: Int? public var name: Int?
public var _class: String? public var _class: String?
public init(name: Int?, _class: String?) { public init(name: Int? = nil, _class: String? = nil) {
self.name = name self.name = name
self._class = _class self._class = _class
} }

View File

@ -15,7 +15,7 @@ public struct Name: Codable {
public var property: String? public var property: String?
public var _123number: Int? public var _123number: Int?
public init(name: Int, snakeCase: Int?, property: String?, _123number: Int?) { public init(name: Int, snakeCase: Int? = nil, property: String? = nil, _123number: Int? = nil) {
self.name = name self.name = name
self.snakeCase = snakeCase self.snakeCase = snakeCase
self.property = property self.property = property

View File

@ -11,7 +11,7 @@ public struct NumberOnly: Codable {
public var justNumber: Double? public var justNumber: Double?
public init(justNumber: Double?) { public init(justNumber: Double? = nil) {
self.justNumber = justNumber self.justNumber = justNumber
} }

View File

@ -22,7 +22,7 @@ public struct Order: Codable {
public var status: Status? public var status: Status?
public var complete: Bool? = false public var complete: Bool? = false
public init(id: Int64?, petId: Int64?, quantity: Int?, shipDate: Date?, status: Status?, complete: Bool?) { public init(id: Int64? = nil, petId: Int64? = nil, quantity: Int? = nil, shipDate: Date? = nil, status: Status? = nil, complete: Bool? = nil) {
self.id = id self.id = id
self.petId = petId self.petId = petId
self.quantity = quantity self.quantity = quantity

View File

@ -13,7 +13,7 @@ public struct OuterComposite: Codable {
public var myString: String? public var myString: String?
public var myBoolean: Bool? public var myBoolean: Bool?
public init(myNumber: Double?, myString: String?, myBoolean: Bool?) { public init(myNumber: Double? = nil, myString: String? = nil, myBoolean: Bool? = nil) {
self.myNumber = myNumber self.myNumber = myNumber
self.myString = myString self.myString = myString
self.myBoolean = myBoolean self.myBoolean = myBoolean

View File

@ -22,7 +22,7 @@ public struct Pet: Codable {
/** pet status in the store */ /** pet status in the store */
public var status: Status? public var status: Status?
public init(id: Int64?, category: Category?, name: String, photoUrls: [String], tags: [Tag]?, status: Status?) { public init(id: Int64? = nil, category: Category? = nil, name: String, photoUrls: [String], tags: [Tag]? = nil, status: Status? = nil) {
self.id = id self.id = id
self.category = category self.category = category
self.name = name self.name = name

View File

@ -12,7 +12,7 @@ public struct ReadOnlyFirst: Codable {
public var bar: String? public var bar: String?
public var baz: String? public var baz: String?
public init(bar: String?, baz: String?) { public init(bar: String? = nil, baz: String? = nil) {
self.bar = bar self.bar = bar
self.baz = baz self.baz = baz
} }

View File

@ -12,7 +12,7 @@ public struct Return: Codable {
public var _return: Int? public var _return: Int?
public init(_return: Int?) { public init(_return: Int? = nil) {
self._return = _return self._return = _return
} }

View File

@ -11,7 +11,7 @@ public struct SpecialModelName: Codable {
public var specialPropertyName: Int64? public var specialPropertyName: Int64?
public init(specialPropertyName: Int64?) { public init(specialPropertyName: Int64? = nil) {
self.specialPropertyName = specialPropertyName self.specialPropertyName = specialPropertyName
} }

View File

@ -12,7 +12,7 @@ public struct Tag: Codable {
public var id: Int64? public var id: Int64?
public var name: String? public var name: String?
public init(id: Int64?, name: String?) { public init(id: Int64? = nil, name: String? = nil) {
self.id = id self.id = id
self.name = name self.name = name
} }

View File

@ -19,7 +19,7 @@ public struct User: Codable {
/** User Status */ /** User Status */
public var userStatus: Int? public var userStatus: Int?
public init(id: Int64?, username: String?, firstName: String?, lastName: String?, email: String?, password: String?, phone: String?, userStatus: Int?) { public init(id: Int64? = nil, username: String? = nil, firstName: String? = nil, lastName: String? = nil, email: String? = nil, password: String? = nil, phone: String? = nil, userStatus: Int? = nil) {
self.id = id self.id = id
self.username = username self.username = username
self.firstName = firstName self.firstName = firstName

View File

@ -12,7 +12,7 @@ public struct AdditionalPropertiesClass: Codable {
public var mapString: [String: String]? public var mapString: [String: String]?
public var mapMapString: [String: [String: String]]? public var mapMapString: [String: [String: String]]?
public init(mapString: [String: String]?, mapMapString: [String: [String: String]]?) { public init(mapString: [String: String]? = nil, mapMapString: [String: [String: String]]? = nil) {
self.mapString = mapString self.mapString = mapString
self.mapMapString = mapMapString self.mapMapString = mapMapString
} }

View File

@ -12,7 +12,7 @@ public struct Animal: Codable {
public var className: String public var className: String
public var color: String? = "red" public var color: String? = "red"
public init(className: String, color: String?) { public init(className: String, color: String? = nil) {
self.className = className self.className = className
self.color = color self.color = color
} }

View File

@ -13,7 +13,7 @@ public struct ApiResponse: Codable {
public var type: String? public var type: String?
public var message: String? public var message: String?
public init(code: Int?, type: String?, message: String?) { public init(code: Int? = nil, type: String? = nil, message: String? = nil) {
self.code = code self.code = code
self.type = type self.type = type
self.message = message self.message = message

View File

@ -11,7 +11,7 @@ public struct ArrayOfArrayOfNumberOnly: Codable {
public var arrayArrayNumber: [[Double]]? public var arrayArrayNumber: [[Double]]?
public init(arrayArrayNumber: [[Double]]?) { public init(arrayArrayNumber: [[Double]]? = nil) {
self.arrayArrayNumber = arrayArrayNumber self.arrayArrayNumber = arrayArrayNumber
} }

View File

@ -11,7 +11,7 @@ public struct ArrayOfNumberOnly: Codable {
public var arrayNumber: [Double]? public var arrayNumber: [Double]?
public init(arrayNumber: [Double]?) { public init(arrayNumber: [Double]? = nil) {
self.arrayNumber = arrayNumber self.arrayNumber = arrayNumber
} }

View File

@ -13,7 +13,7 @@ public struct ArrayTest: Codable {
public var arrayArrayOfInteger: [[Int64]]? public var arrayArrayOfInteger: [[Int64]]?
public var arrayArrayOfModel: [[ReadOnlyFirst]]? public var arrayArrayOfModel: [[ReadOnlyFirst]]?
public init(arrayOfString: [String]?, arrayArrayOfInteger: [[Int64]]?, arrayArrayOfModel: [[ReadOnlyFirst]]?) { public init(arrayOfString: [String]? = nil, arrayArrayOfInteger: [[Int64]]? = nil, arrayArrayOfModel: [[ReadOnlyFirst]]? = nil) {
self.arrayOfString = arrayOfString self.arrayOfString = arrayOfString
self.arrayArrayOfInteger = arrayArrayOfInteger self.arrayArrayOfInteger = arrayArrayOfInteger
self.arrayArrayOfModel = arrayArrayOfModel self.arrayArrayOfModel = arrayArrayOfModel

View File

@ -17,7 +17,7 @@ public struct Capitalization: Codable {
/** Name of the pet */ /** Name of the pet */
public var ATT_NAME: String? public var ATT_NAME: String?
public init(smallCamel: String?, capitalCamel: String?, smallSnake: String?, capitalSnake: String?, sCAETHFlowPoints: String?, ATT_NAME: String?) { public init(smallCamel: String? = nil, capitalCamel: String? = nil, smallSnake: String? = nil, capitalSnake: String? = nil, sCAETHFlowPoints: String? = nil, ATT_NAME: String? = nil) {
self.smallCamel = smallCamel self.smallCamel = smallCamel
self.capitalCamel = capitalCamel self.capitalCamel = capitalCamel
self.smallSnake = smallSnake self.smallSnake = smallSnake

View File

@ -13,7 +13,7 @@ public struct Cat: Codable {
public var color: String? = "red" public var color: String? = "red"
public var declawed: Bool? public var declawed: Bool?
public init(className: String, color: String?, declawed: Bool?) { public init(className: String, color: String? = nil, declawed: Bool? = nil) {
self.className = className self.className = className
self.color = color self.color = color
self.declawed = declawed self.declawed = declawed

View File

@ -11,7 +11,7 @@ public struct CatAllOf: Codable {
public var declawed: Bool? public var declawed: Bool?
public init(declawed: Bool?) { public init(declawed: Bool? = nil) {
self.declawed = declawed self.declawed = declawed
} }

View File

@ -12,7 +12,7 @@ public struct Category: Codable {
public var id: Int64? public var id: Int64?
public var name: String = "default-name" public var name: String = "default-name"
public init(id: Int64?, name: String) { public init(id: Int64? = nil, name: String) {
self.id = id self.id = id
self.name = name self.name = name
} }

View File

@ -12,7 +12,7 @@ public struct ClassModel: Codable {
public var _class: String? public var _class: String?
public init(_class: String?) { public init(_class: String? = nil) {
self._class = _class self._class = _class
} }

View File

@ -11,7 +11,7 @@ public struct Client: Codable {
public var client: String? public var client: String?
public init(client: String?) { public init(client: String? = nil) {
self.client = client self.client = client
} }

View File

@ -13,7 +13,7 @@ public struct Dog: Codable {
public var color: String? = "red" public var color: String? = "red"
public var breed: String? public var breed: String?
public init(className: String, color: String?, breed: String?) { public init(className: String, color: String? = nil, breed: String? = nil) {
self.className = className self.className = className
self.color = color self.color = color
self.breed = breed self.breed = breed

View File

@ -11,7 +11,7 @@ public struct DogAllOf: Codable {
public var breed: String? public var breed: String?
public init(breed: String?) { public init(breed: String? = nil) {
self.breed = breed self.breed = breed
} }

View File

@ -20,7 +20,7 @@ public struct EnumArrays: Codable {
public var justSymbol: JustSymbol? public var justSymbol: JustSymbol?
public var arrayEnum: [ArrayEnum]? public var arrayEnum: [ArrayEnum]?
public init(justSymbol: JustSymbol?, arrayEnum: [ArrayEnum]?) { public init(justSymbol: JustSymbol? = nil, arrayEnum: [ArrayEnum]? = nil) {
self.justSymbol = justSymbol self.justSymbol = justSymbol
self.arrayEnum = arrayEnum self.arrayEnum = arrayEnum
} }

View File

@ -33,7 +33,7 @@ public struct EnumTest: Codable {
public var enumNumber: EnumNumber? public var enumNumber: EnumNumber?
public var outerEnum: OuterEnum? public var outerEnum: OuterEnum?
public init(enumString: EnumString?, enumStringRequired: EnumStringRequired, enumInteger: EnumInteger?, enumNumber: EnumNumber?, outerEnum: OuterEnum?) { public init(enumString: EnumString? = nil, enumStringRequired: EnumStringRequired, enumInteger: EnumInteger? = nil, enumNumber: EnumNumber? = nil, outerEnum: OuterEnum? = nil) {
self.enumString = enumString self.enumString = enumString
self.enumStringRequired = enumStringRequired self.enumStringRequired = enumStringRequired
self.enumInteger = enumInteger self.enumInteger = enumInteger

View File

@ -13,7 +13,7 @@ public struct File: Codable {
/** Test capitalization */ /** Test capitalization */
public var sourceURI: String? public var sourceURI: String?
public init(sourceURI: String?) { public init(sourceURI: String? = nil) {
self.sourceURI = sourceURI self.sourceURI = sourceURI
} }

View File

@ -12,7 +12,7 @@ public struct FileSchemaTestClass: Codable {
public var file: File? public var file: File?
public var files: [File]? public var files: [File]?
public init(file: File?, files: [File]?) { public init(file: File? = nil, files: [File]? = nil) {
self.file = file self.file = file
self.files = files self.files = files
} }

View File

@ -23,7 +23,7 @@ public struct FormatTest: Codable {
public var uuid: UUID? public var uuid: UUID?
public var password: String public var password: String
public init(integer: Int?, int32: Int?, int64: Int64?, number: Double, float: Float?, double: Double?, string: String?, byte: Data, binary: URL?, date: Date, dateTime: Date?, uuid: UUID?, password: String) { public init(integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, number: Double, float: Float? = nil, double: Double? = nil, string: String? = nil, byte: Data, binary: URL? = nil, date: Date, dateTime: Date? = nil, uuid: UUID? = nil, password: String) {
self.integer = integer self.integer = integer
self.int32 = int32 self.int32 = int32
self.int64 = int64 self.int64 = int64

View File

@ -12,7 +12,7 @@ public struct HasOnlyReadOnly: Codable {
public var bar: String? public var bar: String?
public var foo: String? public var foo: String?
public init(bar: String?, foo: String?) { public init(bar: String? = nil, foo: String? = nil) {
self.bar = bar self.bar = bar
self.foo = foo self.foo = foo
} }

View File

@ -11,7 +11,7 @@ public struct List: Codable {
public var _123list: String? public var _123list: String?
public init(_123list: String?) { public init(_123list: String? = nil) {
self._123list = _123list self._123list = _123list
} }

View File

@ -18,7 +18,7 @@ public struct MapTest: Codable {
public var directMap: [String: Bool]? public var directMap: [String: Bool]?
public var indirectMap: StringBooleanMap? public var indirectMap: StringBooleanMap?
public init(mapMapOfString: [String: [String: String]]?, mapOfEnumString: [String: String]?, directMap: [String: Bool]?, indirectMap: StringBooleanMap?) { public init(mapMapOfString: [String: [String: String]]? = nil, mapOfEnumString: [String: String]? = nil, directMap: [String: Bool]? = nil, indirectMap: StringBooleanMap? = nil) {
self.mapMapOfString = mapMapOfString self.mapMapOfString = mapMapOfString
self.mapOfEnumString = mapOfEnumString self.mapOfEnumString = mapOfEnumString
self.directMap = directMap self.directMap = directMap

View File

@ -13,7 +13,7 @@ public struct MixedPropertiesAndAdditionalPropertiesClass: Codable {
public var dateTime: Date? public var dateTime: Date?
public var map: [String: Animal]? public var map: [String: Animal]?
public init(uuid: UUID?, dateTime: Date?, map: [String: Animal]?) { public init(uuid: UUID? = nil, dateTime: Date? = nil, map: [String: Animal]? = nil) {
self.uuid = uuid self.uuid = uuid
self.dateTime = dateTime self.dateTime = dateTime
self.map = map self.map = map

View File

@ -13,7 +13,7 @@ public struct Model200Response: Codable {
public var name: Int? public var name: Int?
public var _class: String? public var _class: String?
public init(name: Int?, _class: String?) { public init(name: Int? = nil, _class: String? = nil) {
self.name = name self.name = name
self._class = _class self._class = _class
} }

View File

@ -15,7 +15,7 @@ public struct Name: Codable {
public var property: String? public var property: String?
public var _123number: Int? public var _123number: Int?
public init(name: Int, snakeCase: Int?, property: String?, _123number: Int?) { public init(name: Int, snakeCase: Int? = nil, property: String? = nil, _123number: Int? = nil) {
self.name = name self.name = name
self.snakeCase = snakeCase self.snakeCase = snakeCase
self.property = property self.property = property

View File

@ -11,7 +11,7 @@ public struct NumberOnly: Codable {
public var justNumber: Double? public var justNumber: Double?
public init(justNumber: Double?) { public init(justNumber: Double? = nil) {
self.justNumber = justNumber self.justNumber = justNumber
} }

View File

@ -22,7 +22,7 @@ public struct Order: Codable {
public var status: Status? public var status: Status?
public var complete: Bool? = false public var complete: Bool? = false
public init(id: Int64?, petId: Int64?, quantity: Int?, shipDate: Date?, status: Status?, complete: Bool?) { public init(id: Int64? = nil, petId: Int64? = nil, quantity: Int? = nil, shipDate: Date? = nil, status: Status? = nil, complete: Bool? = nil) {
self.id = id self.id = id
self.petId = petId self.petId = petId
self.quantity = quantity self.quantity = quantity

View File

@ -13,7 +13,7 @@ public struct OuterComposite: Codable {
public var myString: String? public var myString: String?
public var myBoolean: Bool? public var myBoolean: Bool?
public init(myNumber: Double?, myString: String?, myBoolean: Bool?) { public init(myNumber: Double? = nil, myString: String? = nil, myBoolean: Bool? = nil) {
self.myNumber = myNumber self.myNumber = myNumber
self.myString = myString self.myString = myString
self.myBoolean = myBoolean self.myBoolean = myBoolean

View File

@ -22,7 +22,7 @@ public struct Pet: Codable {
/** pet status in the store */ /** pet status in the store */
public var status: Status? public var status: Status?
public init(id: Int64?, category: Category?, name: String, photoUrls: [String], tags: [Tag]?, status: Status?) { public init(id: Int64? = nil, category: Category? = nil, name: String, photoUrls: [String], tags: [Tag]? = nil, status: Status? = nil) {
self.id = id self.id = id
self.category = category self.category = category
self.name = name self.name = name

View File

@ -12,7 +12,7 @@ public struct ReadOnlyFirst: Codable {
public var bar: String? public var bar: String?
public var baz: String? public var baz: String?
public init(bar: String?, baz: String?) { public init(bar: String? = nil, baz: String? = nil) {
self.bar = bar self.bar = bar
self.baz = baz self.baz = baz
} }

View File

@ -12,7 +12,7 @@ public struct Return: Codable {
public var _return: Int? public var _return: Int?
public init(_return: Int?) { public init(_return: Int? = nil) {
self._return = _return self._return = _return
} }

Some files were not shown because too many files have changed in this diff Show More