Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make moduleObject.mustache confirms to JSONEncodable. #11202

Merged
merged 19 commits into from
Jan 9, 2022
Merged

Make moduleObject.mustache confirms to JSONEncodable. #11202

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
09dacc7
Make moduleObject.mustache confirms to JSONEncodable.
0x0c Dec 30, 2021
fc433db
Regenerate samples
0x0c Dec 30, 2021
aae8e6d
Don't confirm JSONEncodable when using Vapor.
0x0c Jan 4, 2022
1c06b4d
Use CodableHelper.jsonEncoder
0x0c Jan 4, 2022
7836e27
Encode `Data` using `encodeToJSON()`
0x0c Jan 4, 2022
e55c757
Update sample
0x0c Jan 4, 2022
ebd7d01
Don't extend JSONEncodable when using Vapor.
0x0c Jan 4, 2022
d855a09
Add JSONEncodable in moduleEnum, moduleInlineEnumDeclaration, and mod…
0x0c Jan 4, 2022
4929d5b
Merge branch 'master' into issue-8925
0x0c Jan 4, 2022
f4da07a
Update sample
0x0c Jan 4, 2022
7c1a144
Merge branch 'issue-8925' of github.com:0x0c/openapi-generator into i…
0x0c Jan 4, 2022
8b1529f
Remove line break.
0x0c Jan 4, 2022
6ec206b
Update sample
0x0c Jan 4, 2022
5a1661b
Revert "Update sample"
0x0c Jan 5, 2022
7acc1fb
Don't confirm JSONEncodable when enum confirms RawRepresentable.
0x0c Jan 5, 2022
51fe33f
Update sample
0x0c Jan 5, 2022
672df35
Add space before {
0x0c Jan 6, 2022
8962b8b
Update sample
0x0c Jan 6, 2022
235b824
Don't confirm JSONEncodable when enum confirms RawRepresentable.
0x0c Jan 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
13 changes: 12 additions & 1 deletion modules/openapi-generator/src/main/resources/swift5/Extensions.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@0x0c just a small nit, could you please make this in one line to improve the generated code?

}{{/useVapor}}{{#generateModelAdditionalProperties}}

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done with 8b1529f

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, could you please update the sample projects also?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK!

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The last commit brought a lot of undesired changes, could you please revert it?
Maybe you need to first merge the master branch into yours and then run the following commands.

./mvnw clean package 
./bin/generate-samples.sh
./bin/utils/export_docs_generators.sh

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done with 5a1661b and 51fe33f

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please explain why some enums are not JSONEncodable?
Is there any issue that you found?

Copy link
Contributor Author

@0x0c 0x0c Jan 6, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since enum value that confirms RawRepresentable a.k.a primitive value is already confirm JSONEncodable here and here, it seems to that modelEnum.mustache and modelInlineEnumDeclaration.mustache should not confirm JSONCodable. If confirm explicitly, Xcode could not build generated source code.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You are right, thanks 👍


extension String: CodingKey {

Expand Down
2 changes: 1 addition & 1 deletion modules/openapi-generator/src/main/resources/swift5/modelEnum.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} enum {{classname}}: {{dataType}}, {{#useVapor}}Content, Hashable{{/useVapor}}{{^useVapor}}Codable{{/useVapor}}, CaseIterable{{#enumUnknownDefaultCase}}{{#isInteger}}, CaseIterableDefaultsLast{{/isInteger}}{{#isFloat}}, CaseIterableDefaultsLast{{/isFloat}}{{#isDouble}}, CaseIterableDefaultsLast{{/isDouble}}{{#isString}}, CaseIterableDefaultsLast{{/isString}}{{/enumUnknownDefaultCase}} {
{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} enum {{classname}}: {{dataType}}, {{#useVapor}}Content, Hashable{{/useVapor}}{{^useVapor}}Codable, JSONEncodable{{/useVapor}}, CaseIterable{{#enumUnknownDefaultCase}}{{#isInteger}}, CaseIterableDefaultsLast{{/isInteger}}{{#isFloat}}, CaseIterableDefaultsLast{{/isFloat}}{{#isDouble}}, CaseIterableDefaultsLast{{/isDouble}}{{#isString}}, CaseIterableDefaultsLast{{/isString}}{{/enumUnknownDefaultCase}} {
{{#allowableValues}}
{{#enumVars}}
case {{{name}}} = {{{value}}}
Expand Down
2 changes: 1 addition & 1 deletion modules/openapi-generator/src/main/resources/swift5/modelInlineEnumDeclaration.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} enum {{enumName}}: {{^isContainer}}{{dataType}}{{/isContainer}}{{#isContainer}}String{{/isContainer}}, {{#useVapor}}Content, Hashable{{/useVapor}}{{^useVapor}}Codable{{/useVapor}}, CaseIterable{{#enumUnknownDefaultCase}}{{#isInteger}}, CaseIterableDefaultsLast{{/isInteger}}{{#isFloat}}, CaseIterableDefaultsLast{{/isFloat}}{{#isDouble}}, CaseIterableDefaultsLast{{/isDouble}}{{#isString}}, CaseIterableDefaultsLast{{/isString}}{{#isContainer}}, CaseIterableDefaultsLast{{/isContainer}}{{/enumUnknownDefaultCase}} {
{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} enum {{enumName}}: {{^isContainer}}{{dataType}}{{/isContainer}}{{#isContainer}}String{{/isContainer}}, {{#useVapor}}Content, Hashable{{/useVapor}}{{^useVapor}}Codable, JSONEncodable{{/useVapor}}, CaseIterable{{#enumUnknownDefaultCase}}{{#isInteger}}, CaseIterableDefaultsLast{{/isInteger}}{{#isFloat}}, CaseIterableDefaultsLast{{/isFloat}}{{#isDouble}}, CaseIterableDefaultsLast{{/isDouble}}{{#isString}}, CaseIterableDefaultsLast{{/isString}}{{#isContainer}}, CaseIterableDefaultsLast{{/isContainer}}{{/enumUnknownDefaultCase}} {
{{#allowableValues}}
{{#enumVars}}
case {{{name}}} = {{{value}}}
Expand Down
4 changes: 2 additions & 2 deletions modules/openapi-generator/src/main/resources/swift5/modelObject.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{^objcCompatible}}{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} {{#useClasses}}final class{{/useClasses}}{{^useClasses}}struct{{/useClasses}} {{{classname}}}: {{#useVapor}}Content{{/useVapor}}{{^useVapor}}Codable{{/useVapor}}{{#vendorExtensions.x-swift-hashable}}, Hashable{{/vendorExtensions.x-swift-hashable}} {
{{/objcCompatible}}{{#objcCompatible}}@objc {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} class {{classname}}: NSObject, Codable {
{{^objcCompatible}}{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} {{#useClasses}}final class{{/useClasses}}{{^useClasses}}struct{{/useClasses}} {{{classname}}}: {{#useVapor}}Content{{/useVapor}}{{^useVapor}}Codable, JSONEncodable{{/useVapor}}{{#vendorExtensions.x-swift-hashable}}, Hashable{{/vendorExtensions.x-swift-hashable}}{
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@0x0c another nit that I found is that at the end of the line, there is a space before the final { that was acidently removed and is creating some noise for example in the vapor client that shouldn't have any changes with this PR.
Could you please restore that space, to avoid noise in the generated code?
This command should generate the Swift sample projects.

./bin/generate-samples.sh bin/configs/swift5-*
`
``

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done with 672df35 and 8962b8b

{{/objcCompatible}}{{#objcCompatible}}@objc {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} class {{classname}}: NSObject, Codable, JSONEncodable {
{{/objcCompatible}}

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please also add the JSONEncodable conformance after Codable in the following files, please?
modelEnum.mustache
modelInlineEnumDeclaration.mustache
modelOneOf.mustache

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done with d855a09 and 4929d5b .

{{#allVars}}
Expand Down
2 changes: 1 addition & 1 deletion modules/openapi-generator/src/main/resources/swift5/modelOneOf.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
public enum {{classname}}: {{#useVapor}}Content{{/useVapor}}{{^useVapor}}Codable{{#vendorExtensions.x-swift-hashable}}, Hashable{{/vendorExtensions.x-swift-hashable}}{{/useVapor}} {
public enum {{classname}}: {{#useVapor}}Content{{/useVapor}}{{^useVapor}}Codable, JSONEncodable{{#vendorExtensions.x-swift-hashable}}, Hashable{{/vendorExtensions.x-swift-hashable}}{{/useVapor}} {
{{#oneOf}}
case type{{.}}({{.}})
{{/oneOf}}
Expand Down
44 changes: 44 additions & 0 deletions modules/openapi-generator/src/test/resources/jsoncodable.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
openapi: 3.0.0
info:
title: test
version: '1.0'
servers:
- url: 'http://localhost:3000'
paths:
/postModel:
post:
summary: Create New User
operationId: post-user
responses:
'200':
description: User Created
content:
application/json:
schema:
$ref: '#/components/schemas/User'
examples: {}
'400':
description: Missing Required Information
description: Create a new user.
requestBody:
content:
multipart/form-data:
schema:
$ref: '#/components/schemas/Request'
parameters: []
components:
schemas:
User:
title: User
type: object
description: ''
x-examples: {}
properties:
integerValue:
type: integer
Request:
title: Request
type: object
properties:
user1:
$ref: '#/components/schemas/User'
11 changes: 11 additions & 0 deletions .../client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,17 @@ 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 {
Expand Down
2 changes: 1 addition & 1 deletion ...5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]]?
Expand Down
2 changes: 1 addition & 1 deletion ...ient/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ...petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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?
Expand Down
2 changes: 1 addition & 1 deletion ...t5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import Foundation
import AnyCodable
#endif

public struct ArrayOfArrayOfNumberOnly: Codable, Hashable {
public struct ArrayOfArrayOfNumberOnly: Codable, JSONEncodable, Hashable{

public var arrayArrayNumber: [[Double]]?

Expand Down
2 changes: 1 addition & 1 deletion ...re/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import Foundation
import AnyCodable
#endif

public struct ArrayOfNumberOnly: Codable, Hashable {
public struct ArrayOfNumberOnly: Codable, JSONEncodable, Hashable{

public var arrayNumber: [Double]?

Expand Down
2 changes: 1 addition & 1 deletion ...t/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]]?
Expand Down
2 changes: 1 addition & 1 deletion ...store/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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?
Expand Down
2 changes: 1 addition & 1 deletion .../client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ...nt/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import Foundation
import AnyCodable
#endif

public struct CatAllOf: Codable, Hashable {
public struct CatAllOf: Codable, JSONEncodable, Hashable{

public var declawed: Bool?

Expand Down
2 changes: 1 addition & 1 deletion ...nt/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion .../petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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?

Expand Down
2 changes: 1 addition & 1 deletion ...ient/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Client.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import Foundation
import AnyCodable
#endif

public struct Client: Codable, Hashable {
public struct Client: Codable, JSONEncodable, Hashable{

public var client: String?

Expand Down
2 changes: 1 addition & 1 deletion .../client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ...nt/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import Foundation
import AnyCodable
#endif

public struct DogAllOf: Codable, Hashable {
public struct DogAllOf: Codable, JSONEncodable, Hashable{

public var breed: String?

Expand Down
6 changes: 3 additions & 3 deletions .../petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ import Foundation
import AnyCodable
#endif

public struct EnumArrays: Codable, Hashable {
public struct EnumArrays: Codable, JSONEncodable, Hashable{

public enum JustSymbol: String, Codable, CaseIterable {
public enum JustSymbol: String, Codable, JSONEncodable, CaseIterable {
case greaterThanOrEqualTo = ">="
case dollar = "$"
}
public enum ArrayEnum: String, Codable, CaseIterable {
public enum ArrayEnum: String, Codable, JSONEncodable, CaseIterable {
case fish = "fish"
case crab = "crab"
}
Expand Down
2 changes: 1 addition & 1 deletion ...t/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import Foundation
import AnyCodable
#endif

public enum EnumClass: String, Codable, CaseIterable {
public enum EnumClass: String, Codable, JSONEncodable, CaseIterable {
case abc = "_abc"
case efg = "-efg"
case xyz = "(xyz)"
Expand Down
10 changes: 5 additions & 5 deletions ...nt/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,23 @@ import Foundation
import AnyCodable
#endif

public struct EnumTest: Codable, Hashable {
public struct EnumTest: Codable, JSONEncodable, Hashable{

public enum EnumString: String, Codable, CaseIterable {
public enum EnumString: String, Codable, JSONEncodable, CaseIterable {
case upper = "UPPER"
case lower = "lower"
case empty = ""
}
public enum EnumStringRequired: String, Codable, CaseIterable {
public enum EnumStringRequired: String, Codable, JSONEncodable, CaseIterable {
case upper = "UPPER"
case lower = "lower"
case empty = ""
}
public enum EnumInteger: Int, Codable, CaseIterable {
public enum EnumInteger: Int, Codable, JSONEncodable, CaseIterable {
case _1 = 1
case number1 = -1
}
public enum EnumNumber: Double, Codable, CaseIterable {
public enum EnumNumber: Double, Codable, JSONEncodable, CaseIterable {
case _11 = 1.1
case number12 = -1.2
}
Expand Down
2 changes: 1 addition & 1 deletion ...client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/File.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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?
Expand Down
2 changes: 1 addition & 1 deletion .../swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]?
Expand Down
2 changes: 1 addition & 1 deletion .../petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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?
Expand Down
2 changes: 1 addition & 1 deletion ...tore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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?
Expand Down
2 changes: 1 addition & 1 deletion ...client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/List.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import Foundation
import AnyCodable
#endif

public struct List: Codable, Hashable {
public struct List: Codable, JSONEncodable, Hashable{

public var _123list: String?

Expand Down
4 changes: 2 additions & 2 deletions ...ent/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import Foundation
import AnyCodable
#endif

public struct MapTest: Codable, Hashable {
public struct MapTest: Codable, JSONEncodable, Hashable{

public enum MapOfEnumString: String, Codable, CaseIterable {
public enum MapOfEnumString: String, Codable, JSONEncodable, CaseIterable {
case upper = "UPPER"
case lower = "lower"
}
Expand Down
2 changes: 1 addition & 1 deletion .../PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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?
Expand Down
2 changes: 1 addition & 1 deletion ...ore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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?
Expand Down
2 changes: 1 addition & 1 deletion ...client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Name.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion .../petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import Foundation
import AnyCodable
#endif

public struct NumberOnly: Codable, Hashable {
public struct NumberOnly: Codable, JSONEncodable, Hashable{

public var justNumber: Double?

Expand Down
4 changes: 2 additions & 2 deletions ...lient/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import Foundation
import AnyCodable
#endif

public struct Order: Codable, Hashable {
public struct Order: Codable, JSONEncodable, Hashable{

public enum Status: String, Codable, CaseIterable {
public enum Status: String, Codable, JSONEncodable, CaseIterable {
case placed = "placed"
case approved = "approved"
case delivered = "delivered"
Expand Down
Loading