loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-07-04 06:30:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

add extension for hashable in swift5 (#7300)

Browse Source
This commit is contained in:
William Cheng 2020-08-26 19:29:29 +08:00 committed by GitHub
parent 98582d5780
commit 11a674f248
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift5ClientCodegen.java
View File

@ -197,6 +197,7 @@ public class Swift5ClientCodegen extends DefaultCodegen implements CodegenConfig
typeMapping.put("array", "Array"); typeMapping.put("array", "Array");
typeMapping.put("List", "Array"); typeMapping.put("List", "Array");
typeMapping.put("map", "Dictionary"); typeMapping.put("map", "Dictionary");
typeMapping.put("set", "Set");
typeMapping.put("date", "Date"); typeMapping.put("date", "Date");
typeMapping.put("Date", "Date"); typeMapping.put("Date", "Date");
typeMapping.put("DateTime", "Date"); typeMapping.put("DateTime", "Date");

10
modules/openapi-generator/src/main/resources/swift5/modelObject.mustache vendored
View File

@ -1,5 +1,9 @@
{{^objcCompatible}}{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} struct {{classname}}: Codable { {{/objcCompatible}} {{^objcCompatible}}
{{#objcCompatible}}@objc {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} class {{classname}}: NSObject, Codable { {{/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}} {{#allVars}}
{{#isEnum}} {{#isEnum}}
@ -86,4 +90,4 @@
case {{name}}{{#vendorExtensions.x-codegen-escaped-property-name}} = "{{{baseName}}}"{{/vendorExtensions.x-codegen-escaped-property-name}}{{/allVars}} case {{name}}{{#vendorExtensions.x-codegen-escaped-property-name}} = "{{{baseName}}}"{{/vendorExtensions.x-codegen-escaped-property-name}}{{/allVars}}
} }
{{/vendorExtensions.x-codegen-has-escaped-property-names}}{{/additionalPropertiesType}} {{/vendorExtensions.x-codegen-has-escaped-property-names}}{{/additionalPropertiesType}}
} }

1
modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml
View File

@ -1134,6 +1134,7 @@ definitions:
xml: xml:
name: Tag name: Tag
Pet: Pet:
x-swift-hashable: true
type: object type: object
required: required:
- name - name

2
samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
View File

@ -7,7 +7,7 @@
import Foundation import Foundation
public struct Pet: Codable { public struct Pet: Codable, Hashable {
public enum Status: String, Codable, CaseIterable { public enum Status: String, Codable, CaseIterable {
case available = "available" case available = "available"

2
samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
View File

@ -7,7 +7,7 @@
import Foundation import Foundation
public struct Pet: Codable { public struct Pet: Codable, Hashable {
public enum Status: String, Codable, CaseIterable { public enum Status: String, Codable, CaseIterable {
case available = "available" case available = "available"

2
samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
View File

@ -7,7 +7,7 @@
import Foundation import Foundation
public struct Pet: Codable { public struct Pet: Codable, Hashable {
public enum Status: String, Codable, CaseIterable { public enum Status: String, Codable, CaseIterable {
case available = "available" case available = "available"

2
samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
View File

@ -7,7 +7,7 @@
import Foundation import Foundation
internal struct Pet: Codable { internal struct Pet: Codable, Hashable {
internal enum Status: String, Codable, CaseIterable { internal enum Status: String, Codable, CaseIterable {
case available = "available" case available = "available"

1
samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift
View File

@ -8,7 +8,6 @@
import Foundation import Foundation
/** Model for testing model with \"_class\" property */ /** Model for testing model with \"_class\" property */
@objc public class ClassModel: NSObject, Codable { @objc public class ClassModel: NSObject, Codable {
public var _class: String? public var _class: String?

1
samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/File.swift
View File

@ -8,7 +8,6 @@
import Foundation import Foundation
/** Must be named `File` for test. */ /** Must be named `File` for test. */
@objc public class File: NSObject, Codable { @objc public class File: NSObject, Codable {
/** Test capitalization */ /** Test capitalization */

1
samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift
View File

@ -8,7 +8,6 @@
import Foundation import Foundation
/** Model for testing model name starting with number */ /** Model for testing model name starting with number */
@objc public class Model200Response: NSObject, Codable { @objc public class Model200Response: NSObject, Codable {
public var name: Int? public var name: Int?

1
samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Name.swift
View File

@ -8,7 +8,6 @@
import Foundation import Foundation
/** Model for testing model name same as property name */ /** Model for testing model name same as property name */
@objc public class Name: NSObject, Codable { @objc public class Name: NSObject, Codable {
public var name: Int public var name: Int

2
samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
View File

@ -7,7 +7,7 @@
import Foundation import Foundation
@objc public class Pet: NSObject, Codable { @objc public class Pet: NSObject, Codable, Hashable {
public enum Status: String, Codable, CaseIterable { public enum Status: String, Codable, CaseIterable {
case available = "available" case available = "available"

1
samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Return.swift
View File

@ -8,7 +8,6 @@
import Foundation import Foundation
/** Model for testing reserved words */ /** Model for testing reserved words */
@objc public class Return: NSObject, Codable { @objc public class Return: NSObject, Codable {
public var _return: Int? public var _return: Int?

2
samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
View File

@ -7,7 +7,7 @@
import Foundation import Foundation
public struct Pet: Codable { public struct Pet: Codable, Hashable {
public enum Status: String, Codable, CaseIterable { public enum Status: String, Codable, CaseIterable {
case available = "available" case available = "available"

2
samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
View File

@ -7,7 +7,7 @@
import Foundation import Foundation
public struct Pet: Codable { public struct Pet: Codable, Hashable {
public enum Status: String, Codable, CaseIterable { public enum Status: String, Codable, CaseIterable {
case available = "available" case available = "available"

2
samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
View File

@ -7,7 +7,7 @@
import Foundation import Foundation
public struct Pet: Codable { public struct Pet: Codable, Hashable {
public enum Status: String, Codable, CaseIterable { public enum Status: String, Codable, CaseIterable {
case available = "available" case available = "available"

2
samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
View File

@ -7,7 +7,7 @@
import Foundation import Foundation
public struct Pet: Codable { public struct Pet: Codable, Hashable {
public enum Status: String, Codable, CaseIterable { public enum Status: String, Codable, CaseIterable {
case available = "available" case available = "available"

2
samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
View File

@ -7,7 +7,7 @@
import Foundation import Foundation
public struct Pet: Codable { public struct Pet: Codable, Hashable {
public enum Status: String, Codable, CaseIterable { public enum Status: String, Codable, CaseIterable {
case available = "available" case available = "available"