add extension for hashable in swift5 (#7300)

OpenAPITools · Aug 26, 2020 · 11a674f · 11a674f
1 parent 98582d5
commit 11a674f
Show file tree

Hide file tree

Showing 18 changed files with 19 additions and 18 deletions.
diff --git a/...enapi-generator/src/main/java/org/openapitools/codegen/languages/Swift5ClientCodegen.java b/...enapi-generator/src/main/java/org/openapitools/codegen/languages/Swift5ClientCodegen.java
@@ -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");

diff --git a/modules/openapi-generator/src/main/resources/swift5/modelObject.mustache b/modules/openapi-generator/src/main/resources/swift5/modelObject.mustache
@@ -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}}
@@ -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}}
-}
+}
diff --git a/...nerator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml b/...nerator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml
@@ -1134,6 +1134,7 @@ definitions:
     xml:
       name: Tag
   Pet:
+    x-swift-hashable: true
     type: object
     required:
       - name

diff --git a/.../client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift b/.../client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 
-public struct Pet: Codable {
+public struct Pet: Codable, Hashable {
 
     public enum Status: String, Codable, CaseIterable {
         case available = "available"

diff --git a/...es/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift b/...es/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 
-public struct Pet: Codable {
+public struct Pet: Codable, Hashable {
 
     public enum Status: String, Codable, CaseIterable {
         case available = "available"

diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 
-public struct Pet: Codable {
+public struct Pet: Codable, Hashable {
 
     public enum Status: String, Codable, CaseIterable {
         case available = "available"

diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 
-internal struct Pet: Codable {
+internal struct Pet: Codable, Hashable {
 
     internal enum Status: String, Codable, CaseIterable {
         case available = "available"

diff --git a/...nt/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift b/...nt/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift
@@ -8,7 +8,6 @@
 import Foundation
 
 /** Model for testing model with \&quot;_class\&quot; property */
-
 @objc public class ClassModel: NSObject, Codable {
 
     public var _class: String?

diff --git a/...s/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/File.swift b/...s/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/File.swift
@@ -8,7 +8,6 @@
 import Foundation
 
 /** Must be named &#x60;File&#x60; for test. */
-
 @objc public class File: NSObject, Codable {
 
     /** Test capitalization */

diff --git a/...store/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift b/...store/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift
@@ -8,7 +8,6 @@
 import Foundation
 
 /** Model for testing model name starting with number */
-
 @objc public class Model200Response: NSObject, Codable {
 
     public var name: Int?

diff --git a/...s/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Name.swift b/...s/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Name.swift
@@ -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

diff --git a/...es/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift b/...es/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
@@ -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"

diff --git a/...client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Return.swift b/...client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Return.swift
@@ -8,7 +8,6 @@
 import Foundation
 
 /** Model for testing reserved words */
-
 @objc public class Return: NSObject, Codable {
 
     public var _return: Int?

diff --git a/...client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift b/...client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 
-public struct Pet: Codable {
+public struct Pet: Codable, Hashable {
 
     public enum Status: String, Codable, CaseIterable {
         case available = "available"

diff --git a/...lient/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift b/...lient/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 
-public struct Pet: Codable {
+public struct Pet: Codable, Hashable {
 
     public enum Status: String, Codable, CaseIterable {
         case available = "available"

diff --git a/...les/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift b/...les/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 
-public struct Pet: Codable {
+public struct Pet: Codable, Hashable {
 
     public enum Status: String, Codable, CaseIterable {
         case available = "available"

diff --git a/...es/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift b/...es/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 
-public struct Pet: Codable {
+public struct Pet: Codable, Hashable {
 
     public enum Status: String, Codable, CaseIterable {
         case available = "available"

diff --git a/...client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift b/...client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 
-public struct Pet: Codable {
+public struct Pet: Codable, Hashable {
 
     public enum Status: String, Codable, CaseIterable {
         case available = "available"