Skip to content

Commit 100dee1

Browse files
Only add extension to types with enum properties
1 parent e99dbc1 commit 100dee1

66 files changed

Lines changed: 20 additions & 364 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

modules/openapi-generator/src/main/resources/swift5/Models.mustache

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@ protocol UnknownCaseCheckable {
4444
var containsUnknownDefaultOpenApiCase: Bool { get }
4545
}
4646

47+
extension UnknownCaseCheckable {
48+
{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} var containsUnknownDefaultOpenApiCase: Bool { false }
49+
}
50+
4751
{{/enumUnknownDefaultCase}}
4852
/// A flexible type that can be encoded (`.encodeNull` or `.encodeValue`)
4953
/// or not encoded (`.encodeNothing`). Intended for request payloads.

modules/openapi-generator/src/main/resources/swift5/model.mustache

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ extension {{projectName}}API {
3030
{{/swiftUseApiNamespace}}{{#models}}{{#model}}{{#vendorExtensions.x-swift-identifiable}}
3131
@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *)
3232
extension {{#swiftUseApiNamespace}}{{projectName}}API.{{/swiftUseApiNamespace}}{{{classname}}}: Identifiable {}
33-
{{/vendorExtensions.x-swift-identifiable}}{{#enumUnknownDefaultCase}}{{^vendorExtensions.x-is-one-of-interface}}{{^isArray}}{{^isEnum}}
33+
{{/vendorExtensions.x-swift-identifiable}}{{#enumUnknownDefaultCase}}{{^vendorExtensions.x-is-one-of-interface}}{{^isArray}}{{^isEnum}}{{#hasEnums}}
3434
extension {{#swiftUseApiNamespace}}{{projectName}}API.{{/swiftUseApiNamespace}}{{{classname}}}: UnknownCaseCheckable {
3535
{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} var containsUnknownDefaultOpenApiCase: Bool {
3636
{{#allVars}}
@@ -56,7 +56,7 @@ extension {{#swiftUseApiNamespace}}{{projectName}}API.{{/swiftUseApiNamespace}}{
5656
return false
5757
}
5858
}
59-
{{/isEnum}}{{/isArray}}{{/vendorExtensions.x-is-one-of-interface}}{{#isEnum}}
59+
{{/hasEnums}}{{/isEnum}}{{/isArray}}{{/vendorExtensions.x-is-one-of-interface}}{{#isEnum}}
6060
extension {{#swiftUseApiNamespace}}{{projectName}}API.{{/swiftUseApiNamespace}}{{{classname}}}: UnknownCaseCheckable {
6161
{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} var containsUnknownDefaultOpenApiCase: Bool {
6262
self == .unknownDefaultOpenApi

modules/openapi-generator/src/main/resources/swift6/Models.mustache

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@ protocol UnknownCaseCheckable {
4444
var containsUnknownDefaultOpenApiCase: Bool { get }
4545
}
4646

47+
extension UnknownCaseCheckable {
48+
{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} var containsUnknownDefaultOpenApiCase: Bool { false }
49+
}
50+
4751
{{/enumUnknownDefaultCase}}
4852
/// A flexible type that can be encoded (`.encodeNull` or `.encodeValue`)
4953
/// or not encoded (`.encodeNothing`). Intended for request payloads.

modules/openapi-generator/src/main/resources/swift6/model.mustache

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ extension {{projectName}}API {
2626
}
2727
{{/swiftUseApiNamespace}}{{#models}}{{#model}}{{#vendorExtensions.x-swift-identifiable}}
2828
extension {{#swiftUseApiNamespace}}{{projectName}}API.{{/swiftUseApiNamespace}}{{{classname}}}: Identifiable {}
29-
{{/vendorExtensions.x-swift-identifiable}}{{#enumUnknownDefaultCase}}{{^vendorExtensions.x-is-one-of-interface}}{{^isArray}}{{^isEnum}}
29+
{{/vendorExtensions.x-swift-identifiable}}{{#enumUnknownDefaultCase}}{{^vendorExtensions.x-is-one-of-interface}}{{^isArray}}{{^isEnum}}{{#hasEnums}}
3030
extension {{#swiftUseApiNamespace}}{{projectName}}API.{{/swiftUseApiNamespace}}{{{classname}}}: UnknownCaseCheckable {
3131
{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} var containsUnknownDefaultOpenApiCase: Bool {
3232
{{#allVars}}
@@ -52,7 +52,7 @@ extension {{#swiftUseApiNamespace}}{{projectName}}API.{{/swiftUseApiNamespace}}{
5252
return false
5353
}
5454
}
55-
{{/isEnum}}{{/isArray}}{{/vendorExtensions.x-is-one-of-interface}}{{#isEnum}}
55+
{{/hasEnums}}{{/isEnum}}{{/isArray}}{{/vendorExtensions.x-is-one-of-interface}}{{#isEnum}}
5656
extension {{#swiftUseApiNamespace}}{{projectName}}API.{{/swiftUseApiNamespace}}{{{classname}}}: UnknownCaseCheckable {
5757
{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} var containsUnknownDefaultOpenApiCase: Bool {
5858
self == .unknownDefaultOpenApi

samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models.swift

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@ protocol UnknownCaseCheckable {
4242
var containsUnknownDefaultOpenApiCase: Bool { get }
4343
}
4444

45+
extension UnknownCaseCheckable {
46+
internal var containsUnknownDefaultOpenApiCase: Bool { false }
47+
}
48+
4549
/// A flexible type that can be encoded (`.encodeNull` or `.encodeValue`)
4650
/// or not encoded (`.encodeNothing`). Intended for request payloads.
4751
internal enum NullEncodable<Wrapped: Hashable>: Hashable {

samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,3 @@ internal struct AdditionalPropertiesClass: Codable, JSONEncodable {
3434
}
3535
}
3636

37-
38-
extension AdditionalPropertiesClass: UnknownCaseCheckable {
39-
internal var containsUnknownDefaultOpenApiCase: Bool {
40-
return false
41-
}
42-
}

samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,3 @@ internal struct Animal: Codable, JSONEncodable {
3434
}
3535
}
3636

37-
38-
extension Animal: UnknownCaseCheckable {
39-
internal var containsUnknownDefaultOpenApiCase: Bool {
40-
return false
41-
}
42-
}

samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,3 @@ internal struct ApiResponse: Codable, JSONEncodable {
3838
}
3939
}
4040

41-
42-
extension ApiResponse: UnknownCaseCheckable {
43-
internal var containsUnknownDefaultOpenApiCase: Bool {
44-
return false
45-
}
46-
}

samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,3 @@ internal struct ArrayOfArrayOfNumberOnly: Codable, JSONEncodable {
3030
}
3131
}
3232

33-
34-
extension ArrayOfArrayOfNumberOnly: UnknownCaseCheckable {
35-
internal var containsUnknownDefaultOpenApiCase: Bool {
36-
return false
37-
}
38-
}

samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,3 @@ internal struct ArrayOfNumberOnly: Codable, JSONEncodable {
3030
}
3131
}
3232

33-
34-
extension ArrayOfNumberOnly: UnknownCaseCheckable {
35-
internal var containsUnknownDefaultOpenApiCase: Bool {
36-
return false
37-
}
38-
}

0 commit comments

Comments
 (0)