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

Add Hashable for Struct #9166

Merged
merged 3 commits into from
Apr 6, 2021
Merged

Add Hashable for Struct #9166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ea38b55
Add hashable for struct
maoyama Apr 4, 2021
18053af
Remove x-swift-hashable
maoyama Apr 4, 2021
3a68491
Run the shell script ./bin/generate-samples.sh
maoyama Apr 4, 2021
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
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion 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,4 +1,4 @@
{{^objcCompatible}}{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} struct {{classname}}: Codable{{#vendorExtensions.x-swift-hashable}}, Hashable{{/vendorExtensions.x-swift-hashable}} {
{{^objcCompatible}}{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} struct {{classname}}: Codable, Hashable {
{{/objcCompatible}}{{#objcCompatible}}@objc {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} class {{classname}}: NSObject, Codable {
{{/objcCompatible}}

Expand Down
1 change: 0 additions & 1 deletion ...nerator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1086,7 +1086,6 @@ definitions:
xml:
name: Order
Category:
x-swift-hashable: true
type: object
required:
- name
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 @@ -7,7 +7,7 @@

import Foundation

public struct AdditionalPropertiesClass: Codable {
public struct AdditionalPropertiesClass: Codable, 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 @@ -7,7 +7,7 @@

import Foundation

public struct Animal: Codable {
public struct Animal: Codable, 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 @@ -7,7 +7,7 @@

import Foundation

public struct ApiResponse: Codable {
public struct ApiResponse: Codable, 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 @@ -7,7 +7,7 @@

import Foundation

public struct ArrayOfArrayOfNumberOnly: Codable {
public struct ArrayOfArrayOfNumberOnly: Codable, 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 @@ -7,7 +7,7 @@

import Foundation

public struct ArrayOfNumberOnly: Codable {
public struct ArrayOfNumberOnly: Codable, 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 @@ -7,7 +7,7 @@

import Foundation

public struct ArrayTest: Codable {
public struct ArrayTest: Codable, 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 @@ -7,7 +7,7 @@

import Foundation

public struct Capitalization: Codable {
public struct Capitalization: Codable, 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 @@ -7,7 +7,7 @@

import Foundation

public struct Cat: Codable {
public struct Cat: Codable, 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 @@ -7,7 +7,7 @@

import Foundation

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

public var declawed: Bool?

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 @@ -8,7 +8,7 @@
import Foundation

/** Model for testing model with \"_class\" property */
public struct ClassModel: Codable {
public struct ClassModel: Codable, 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 @@ -7,7 +7,7 @@

import Foundation

public struct Client: Codable {
public struct Client: Codable, 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 @@ -7,7 +7,7 @@

import Foundation

public struct Dog: Codable {
public struct Dog: Codable, 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 @@ -7,7 +7,7 @@

import Foundation

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

public var breed: String?

Expand Down
2 changes: 1 addition & 1 deletion .../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 @@ -7,7 +7,7 @@

import Foundation

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

public enum JustSymbol: String, Codable, CaseIterable {
case greaterThanOrEqualTo = ">="
Expand Down
2 changes: 1 addition & 1 deletion ...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 @@ -7,7 +7,7 @@

import Foundation

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

public enum EnumString: String, Codable, CaseIterable {
case upper = "UPPER"
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 @@ -8,7 +8,7 @@
import Foundation

/** Must be named `File` for test. */
public struct File: Codable {
public struct File: Codable, 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 @@ -7,7 +7,7 @@

import Foundation

public struct FileSchemaTestClass: Codable {
public struct FileSchemaTestClass: Codable, 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 @@ -7,7 +7,7 @@

import Foundation

public struct FormatTest: Codable {
public struct FormatTest: Codable, 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 @@ -7,7 +7,7 @@

import Foundation

public struct HasOnlyReadOnly: Codable {
public struct HasOnlyReadOnly: Codable, 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 @@ -7,7 +7,7 @@

import Foundation

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

public var _123list: String?

Expand Down
2 changes: 1 addition & 1 deletion ...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 @@ -7,7 +7,7 @@

import Foundation

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

public enum MapOfEnumString: String, Codable, CaseIterable {
case upper = "UPPER"
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 @@ -7,7 +7,7 @@

import Foundation

public struct MixedPropertiesAndAdditionalPropertiesClass: Codable {
public struct MixedPropertiesAndAdditionalPropertiesClass: Codable, 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 @@ -8,7 +8,7 @@
import Foundation

/** Model for testing model name starting with number */
public struct Model200Response: Codable {
public struct Model200Response: Codable, 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 @@ -8,7 +8,7 @@
import Foundation

/** Model for testing model name same as property name */
public struct Name: Codable {
public struct Name: Codable, Hashable {

public var name: Int
public var snakeCase: Int?
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 @@ -7,7 +7,7 @@

import Foundation

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

public var justNumber: Double?

Expand Down
2 changes: 1 addition & 1 deletion ...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 @@ -7,7 +7,7 @@

import Foundation

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

public enum Status: String, Codable, CaseIterable {
case placed = "placed"
Expand Down
2 changes: 1 addition & 1 deletion ...store/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import Foundation

public struct OuterComposite: Codable {
public struct OuterComposite: Codable, Hashable {

public var myNumber: Double?
public var myString: String?
Expand Down
2 changes: 1 addition & 1 deletion ...tstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import Foundation

public struct ReadOnlyFirst: Codable {
public struct ReadOnlyFirst: Codable, Hashable {

public var bar: String?
public var baz: String?
Expand Down
2 changes: 1 addition & 1 deletion ...ient/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Return.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import Foundation

/** Model for testing reserved words */
public struct Return: Codable {
public struct Return: Codable, Hashable {

public var _return: Int?

Expand Down
2 changes: 1 addition & 1 deletion ...ore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import Foundation

public struct SpecialModelName: Codable {
public struct SpecialModelName: Codable, Hashable {

public var specialPropertyName: Int64?

Expand Down
2 changes: 1 addition & 1 deletion ...ore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import Foundation

public struct StringBooleanMap: Codable {
public struct StringBooleanMap: Codable, Hashable {

public var additionalProperties: [String: Bool] = [:]

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

import Foundation

public struct TypeHolderDefault: Codable {
public struct TypeHolderDefault: Codable, Hashable {

public var stringItem: String = "what"
public var numberItem: Double
Expand Down
2 changes: 1 addition & 1 deletion ...re/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import Foundation

public struct TypeHolderExample: Codable {
public struct TypeHolderExample: Codable, Hashable {

public var stringItem: String
public var numberItem: Double
Expand Down
2 changes: 1 addition & 1 deletion ...client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import Foundation

public struct User: Codable {
public struct User: Codable, Hashable {

public var id: Int64?
public var username: String?
Expand Down
2 changes: 1 addition & 1 deletion ...ft5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import Foundation

public struct AdditionalPropertiesClass: Codable {
public struct AdditionalPropertiesClass: Codable, Hashable {

public var mapString: [String: String]?
public var mapMapString: [String: [String: String]]?
Expand Down
2 changes: 1 addition & 1 deletion ...client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import Foundation

public struct Animal: Codable {
public struct Animal: Codable, Hashable {

public var className: String
public var color: String? = "red"
Expand Down
2 changes: 1 addition & 1 deletion ...t/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import Foundation

public struct ApiResponse: Codable {
public struct ApiResponse: Codable, Hashable {

public var code: Int?
public var type: String?
Expand Down
2 changes: 1 addition & 1 deletion ...ift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import Foundation

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

public var arrayArrayNumber: [[Double]]?

Expand Down
2 changes: 1 addition & 1 deletion ...tore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import Foundation

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

public var arrayNumber: [Double]?

Expand Down
2 changes: 1 addition & 1 deletion ...ent/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import Foundation

public struct ArrayTest: Codable {
public struct ArrayTest: Codable, Hashable {

public var arrayOfString: [String]?
public var arrayArrayOfInteger: [[Int64]]?
Expand Down
2 changes: 1 addition & 1 deletion ...etstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import Foundation

public struct Capitalization: Codable {
public struct Capitalization: Codable, Hashable {

public var smallCamel: String?
public var capitalCamel: String?
Expand Down
2 changes: 1 addition & 1 deletion ...es/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import Foundation

public struct Cat: Codable {
public struct Cat: Codable, Hashable {

public var className: String
public var color: String? = "red"
Expand Down
Loading