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

[swift5] Add extension for hashable #7300

Merged
merged 1 commit into from
Aug 26, 2020
Merged

[swift5] Add extension for hashable #7300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ...enapi-generator/src/main/java/org/openapitools/codegen/languages/Swift5ClientCodegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@ public Swift5ClientCodegen() {
typeMapping.put("array", "Array");
typeMapping.put("List", "Array");
typeMapping.put("map", "Dictionary");
typeMapping.put("set", "Set");
typeMapping.put("date", "Date");
typeMapping.put("Date", "Date");
typeMapping.put("DateTime", "Date");
Expand Down
10 changes: 7 additions & 3 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,9 @@
{{^objcCompatible}}{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} struct {{classname}}: Codable { {{/objcCompatible}}
{{#objcCompatible}}@objc {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} class {{classname}}: NSObject, Codable { {{/objcCompatible}}
{{^objcCompatible}}
{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} struct {{classname}}: Codable{{#vendorExtensions.x-swift-hashable}}, Hashable{{/vendorExtensions.x-swift-hashable}} {
{{/objcCompatible}}
{{#objcCompatible}}
@objc {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} class {{classname}}: NSObject, Codable{{#vendorExtensions.x-swift-hashable}}, Hashable{{/vendorExtensions.x-swift-hashable}} {
{{/objcCompatible}}

{{#allVars}}
{{#isEnum}}
Expand Down Expand Up @@ -86,4 +90,4 @@
case {{name}}{{#vendorExtensions.x-codegen-escaped-property-name}} = "{{{baseName}}}"{{/vendorExtensions.x-codegen-escaped-property-name}}{{/allVars}}
}
{{/vendorExtensions.x-codegen-has-escaped-property-names}}{{/additionalPropertiesType}}
}
}
1 change: 1 addition & 0 deletions ...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 @@ -1134,6 +1134,7 @@ definitions:
xml:
name: Tag
Pet:
x-swift-hashable: true
type: object
required:
- name
Expand Down
2 changes: 1 addition & 1 deletion .../client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.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 Pet: Codable {
public struct Pet: Codable, Hashable {

public enum Status: String, Codable, CaseIterable {
case available = "available"
Expand Down
2 changes: 1 addition & 1 deletion ...es/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.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 Pet: Codable {
public struct Pet: Codable, Hashable {

public enum Status: String, Codable, CaseIterable {
case available = "available"
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Pet.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 Pet: Codable {
public struct Pet: Codable, Hashable {

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

import Foundation

internal struct Pet: Codable {
internal struct Pet: Codable, Hashable {

internal enum Status: String, Codable, CaseIterable {
case available = "available"
Expand Down
1 change: 0 additions & 1 deletion ...nt/petstore/swift5/objcCompatible/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,6 @@
import Foundation

/** Model for testing model with \"_class\" property */

@objc public class ClassModel: NSObject, Codable {

public var _class: String?
Expand Down
1 change: 0 additions & 1 deletion ...s/client/petstore/swift5/objcCompatible/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,6 @@
import Foundation

/** Must be named `File` for test. */

@objc public class File: NSObject, Codable {

/** Test capitalization */
Expand Down
1 change: 0 additions & 1 deletion ...store/swift5/objcCompatible/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,6 @@
import Foundation

/** Model for testing model name starting with number */

@objc public class Model200Response: NSObject, Codable {

public var name: Int?
Expand Down
1 change: 0 additions & 1 deletion ...s/client/petstore/swift5/objcCompatible/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,6 @@
import Foundation

/** Model for testing model name same as property name */

@objc public class Name: NSObject, Codable {

public var name: Int
Expand Down
2 changes: 1 addition & 1 deletion ...es/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import Foundation

@objc public class Pet: NSObject, Codable {
@objc public class Pet: NSObject, Codable, Hashable {

public enum Status: String, Codable, CaseIterable {
case available = "available"
Expand Down
1 change: 0 additions & 1 deletion ...client/petstore/swift5/objcCompatible/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,6 @@
import Foundation

/** Model for testing reserved words */

@objc public class Return: NSObject, Codable {

public var _return: Int?
Expand Down
2 changes: 1 addition & 1 deletion ...client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.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 Pet: Codable {
public struct Pet: Codable, Hashable {

public enum Status: String, Codable, CaseIterable {
case available = "available"
Expand Down
2 changes: 1 addition & 1 deletion ...lient/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/Pet.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 Pet: Codable {
public struct Pet: Codable, Hashable {

public enum Status: String, Codable, CaseIterable {
case available = "available"
Expand Down
2 changes: 1 addition & 1 deletion ...les/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.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 Pet: Codable {
public struct Pet: Codable, Hashable {

public enum Status: String, Codable, CaseIterable {
case available = "available"
Expand Down
2 changes: 1 addition & 1 deletion ...es/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.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 Pet: Codable {
public struct Pet: Codable, Hashable {

public enum Status: String, Codable, CaseIterable {
case available = "available"
Expand Down
2 changes: 1 addition & 1 deletion ...client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.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 Pet: Codable {
public struct Pet: Codable, Hashable {

public enum Status: String, Codable, CaseIterable {
case available = "available"
Expand Down