Skip to content

Commit 58b12ba

Browse files
x-sheepx-sheep
authored
[Swift6] Remove QueryStringEncodable for models (#21150)
1 parent eb65e93 commit 58b12ba

413 files changed

Lines changed: 456 additions & 554 deletions

File tree

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/swift6/Extensions.mustache‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,10 @@ extension UUID: ParameterConvertible {
5151
func asParameter(codableHelper: CodableHelper) -> any Sendable { self }
5252
}
5353

54-
extension RawRepresentable where RawValue: ParameterConvertible, RawValue: Sendable {
55-
func asParameter(codableHelper: CodableHelper) -> any Sendable { return self.rawValue }
54+
extension RawRepresentable where RawValue: ParameterConvertible {
55+
func asParameter(codableHelper: CodableHelper) -> any Sendable {
56+
rawValue.asParameter(codableHelper: codableHelper)
57+
}
5658
}
5759

5860
private func encodeIfPossible<T: Sendable>(_ object: T, codableHelper: CodableHelper) -> any Sendable {
@@ -95,15 +97,6 @@ extension Date: ParameterConvertible {
9597
func asParameter(codableHelper: CodableHelper) -> any Sendable {
9698
return codableHelper.dateFormatter.string(from: self)
9799
}
98-
}
99-
100-
extension ParameterConvertible where Self: Encodable {
101-
func asParameter(codableHelper: CodableHelper) -> any Sendable {
102-
guard let data = try? codableHelper.jsonEncoder.encode(self) else {
103-
fatalError("Could not encode to json: \(self)")
104-
}
105-
return data.asParameter(codableHelper: codableHelper)
106-
}
107100
}{{/useVapor}}{{#generateModelAdditionalProperties}}
108101

109102
extension String: @retroactive CodingKey {

‎modules/openapi-generator/src/main/resources/swift6/modelObject.mustache‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
{{^objcCompatible}}{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} {{#useClasses}}final class{{/useClasses}}{{^useClasses}}struct{{/useClasses}} {{{classname}}}: {{^useClasses}}Sendable, {{/useClasses}}{{#useClasses}}{{#readonlyProperties}}@unchecked Sendable, {{/readonlyProperties}}{{/useClasses}}{{#useVapor}}Content{{/useVapor}}{{^useVapor}}Codable{{#useParameterConvertible}}, ParameterConvertible{{/useParameterConvertible}}{{/useVapor}}{{#vendorExtensions.x-swift-hashable}}, Hashable{{/vendorExtensions.x-swift-hashable}} {
2-
{{/objcCompatible}}{{#objcCompatible}}@objcMembers {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} class {{classname}}: NSObject, Codable{{#useParameterConvertible}}, ParameterConvertible{{/useParameterConvertible}} {
1+
{{^objcCompatible}}{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} {{#useClasses}}final class{{/useClasses}}{{^useClasses}}struct{{/useClasses}} {{{classname}}}: {{^useClasses}}Sendable, {{/useClasses}}{{#useClasses}}{{#readonlyProperties}}@unchecked Sendable, {{/readonlyProperties}}{{/useClasses}}{{#useVapor}}Content{{/useVapor}}{{^useVapor}}Codable{{/useVapor}}{{#vendorExtensions.x-swift-hashable}}, Hashable{{/vendorExtensions.x-swift-hashable}} {
2+
{{/objcCompatible}}{{#objcCompatible}}@objcMembers {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} class {{classname}}: NSObject, Codable {
33
{{/objcCompatible}}
44

55
{{#allVars}}

‎modules/openapi-generator/src/main/resources/swift6/modelOneOf.mustache‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} enum {{classname}}: {{^useClasses}}Sendable, {{/useClasses}}{{#useClasses}}{{#readonlyProperties}}Sendable, {{/readonlyProperties}}{{/useClasses}}{{#useVapor}}Content{{/useVapor}}{{^useVapor}}Codable{{#useParameterConvertible}}, ParameterConvertible{{/useParameterConvertible}}{{#vendorExtensions.x-swift-hashable}}, Hashable{{/vendorExtensions.x-swift-hashable}}{{/useVapor}} {
1+
{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} enum {{classname}}: {{^useClasses}}Sendable, {{/useClasses}}{{#useClasses}}{{#readonlyProperties}}Sendable, {{/readonlyProperties}}{{/useClasses}}{{#useVapor}}Content{{/useVapor}}{{^useVapor}}Codable{{#vendorExtensions.x-swift-hashable}}, Hashable{{/vendorExtensions.x-swift-hashable}}{{/useVapor}} {
22
{{#oneOf}}
33
case type{{#transformArrayType}}{{.}}{{/transformArrayType}}({{.}})
44
{{/oneOf}}

‎samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/Extensions.swift‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,10 @@ extension UUID: ParameterConvertible {
4949
func asParameter(codableHelper: CodableHelper) -> any Sendable { self }
5050
}
5151

52-
extension RawRepresentable where RawValue: ParameterConvertible, RawValue: Sendable {
53-
func asParameter(codableHelper: CodableHelper) -> any Sendable { return self.rawValue }
52+
extension RawRepresentable where RawValue: ParameterConvertible {
53+
func asParameter(codableHelper: CodableHelper) -> any Sendable {
54+
rawValue.asParameter(codableHelper: codableHelper)
55+
}
5456
}
5557

5658
private func encodeIfPossible<T: Sendable>(_ object: T, codableHelper: CodableHelper) -> any Sendable {
@@ -95,15 +97,6 @@ extension Date: ParameterConvertible {
9597
}
9698
}
9799

98-
extension ParameterConvertible where Self: Encodable {
99-
func asParameter(codableHelper: CodableHelper) -> any Sendable {
100-
guard let data = try? codableHelper.jsonEncoder.encode(self) else {
101-
fatalError("Could not encode to json: \(self)")
102-
}
103-
return data.asParameter(codableHelper: codableHelper)
104-
}
105-
}
106-
107100
extension String: @retroactive CodingKey {
108101

109102
public var stringValue: String {

‎samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/AdditionalPropertiesClass.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import Foundation
99

10-
public struct AdditionalPropertiesClass: Sendable, Codable, ParameterConvertible, Hashable {
10+
public struct AdditionalPropertiesClass: Sendable, Codable, Hashable {
1111

1212
public var mapString: [String: String]?
1313
public var mapMapString: [String: [String: String]]?

‎samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Animal.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import Foundation
99

10-
public struct Animal: Sendable, Codable, ParameterConvertible, Hashable {
10+
public struct Animal: Sendable, Codable, Hashable {
1111

1212
public var className: String
1313
public var color: String? = "red"

‎samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/ApiResponse.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import Foundation
99

10-
public struct ApiResponse: Sendable, Codable, ParameterConvertible, Hashable {
10+
public struct ApiResponse: Sendable, Codable, Hashable {
1111

1212
public var code: Int?
1313
public var type: String?

‎samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/ArrayOfArrayOfNumberOnly.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import Foundation
99

10-
public struct ArrayOfArrayOfNumberOnly: Sendable, Codable, ParameterConvertible, Hashable {
10+
public struct ArrayOfArrayOfNumberOnly: Sendable, Codable, Hashable {
1111

1212
public var arrayArrayNumber: [[Double]]?
1313

‎samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/ArrayOfNumberOnly.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import Foundation
99

10-
public struct ArrayOfNumberOnly: Sendable, Codable, ParameterConvertible, Hashable {
10+
public struct ArrayOfNumberOnly: Sendable, Codable, Hashable {
1111

1212
public var arrayNumber: [Double]?
1313

‎samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/ArrayTest.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import Foundation
99

10-
public struct ArrayTest: Sendable, Codable, ParameterConvertible, Hashable {
10+
public struct ArrayTest: Sendable, Codable, Hashable {
1111

1212
public var arrayOfString: [String]?
1313
public var arrayArrayOfInteger: [[Int64]]?

0 commit comments

Comments
 (0)