Skip to content

Commit 43b15fb

Browse files
4brunu4brunu
authored
[swift6][client] Remove unnecessary Combine checks (#22810)
1 parent 695f707 commit 43b15fb

19 files changed

Lines changed: 1 addition & 251 deletions

File tree

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@
88
import Foundation{{#usePromiseKit}}
99
@preconcurrency import PromiseKit{{/usePromiseKit}}{{#useRxSwift}}
1010
@preconcurrency import RxSwift{{/useRxSwift}}{{#useCombine}}
11-
#if canImport(Combine)
12-
import Combine
13-
#endif{{/useCombine}}{{#useVapor}}
11+
import Combine{{/useCombine}}{{#useVapor}}
1412
import Vapor{{/useVapor}}{{#swiftUseApiNamespace}}
1513

1614
extension {{projectName}}API {
@@ -161,7 +159,6 @@ extension {{projectName}}API {
161159
- parameter apiConfiguration: The configuration for the http request.{{/apiStaticMethod}}
162160
- returns: AnyPublisher<{{{returnType}}}{{#returnType}}{{#isResponseOptional}}?{{/isResponseOptional}}{{/returnType}}{{^returnType}}Void{{/returnType}}, Error>
163161
*/
164-
#if canImport(Combine)
165162
{{#isDeprecated}}
166163
@available(*, deprecated, message: "This operation is deprecated.")
167164
{{/isDeprecated}}
@@ -194,7 +191,6 @@ extension {{projectName}}API {
194191
.eraseToAnyPublisher()
195192
{{/combineDeferred}}
196193
}
197-
#endif
198194
{{/useCombine}}
199195
{{#useAsyncAwait}}
200196

‎samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/APIs/AnotherFakeAPI.swift‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@
88
import Foundation
99
@preconcurrency import PromiseKit
1010
@preconcurrency import RxSwift
11-
#if canImport(Combine)
1211
import Combine
13-
#endif
1412

1513
open class AnotherFakeAPI {
1614
public let apiConfiguration: PetstoreClientAPIConfiguration
@@ -86,7 +84,6 @@ open class AnotherFakeAPI {
8684
- parameter body: (body) client model
8785
- returns: AnyPublisher<Client, Error>
8886
*/
89-
#if canImport(Combine)
9087
open func call123testSpecialTags(body: Client) -> AnyPublisher<Client, Error> {
9188
let requestBuilder = call123testSpecialTagsWithRequestBuilder(body: body)
9289
let requestTask = requestBuilder.requestTask
@@ -108,7 +105,6 @@ open class AnotherFakeAPI {
108105
}
109106
.eraseToAnyPublisher()
110107
}
111-
#endif
112108

113109
/**
114110
To test special tags

‎samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/APIs/FakeAPI.swift‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@
88
import Foundation
99
@preconcurrency import PromiseKit
1010
@preconcurrency import RxSwift
11-
#if canImport(Combine)
1211
import Combine
13-
#endif
1412

1513
open class FakeAPI {
1614
public let apiConfiguration: PetstoreClientAPIConfiguration
@@ -82,7 +80,6 @@ open class FakeAPI {
8280
- parameter body: (body) Input boolean as post body (optional)
8381
- returns: AnyPublisher<Bool, Error>
8482
*/
85-
#if canImport(Combine)
8683
open func fakeOuterBooleanSerialize(body: Bool? = nil) -> AnyPublisher<Bool, Error> {
8784
let requestBuilder = fakeOuterBooleanSerializeWithRequestBuilder(body: body)
8885
let requestTask = requestBuilder.requestTask
@@ -104,7 +101,6 @@ open class FakeAPI {
104101
}
105102
.eraseToAnyPublisher()
106103
}
107-
#endif
108104

109105
/**
110106

@@ -220,7 +216,6 @@ open class FakeAPI {
220216
- parameter body: (body) Input composite as post body (optional)
221217
- returns: AnyPublisher<OuterComposite, Error>
222218
*/
223-
#if canImport(Combine)
224219
open func fakeOuterCompositeSerialize(body: OuterComposite? = nil) -> AnyPublisher<OuterComposite, Error> {
225220
let requestBuilder = fakeOuterCompositeSerializeWithRequestBuilder(body: body)
226221
let requestTask = requestBuilder.requestTask
@@ -242,7 +237,6 @@ open class FakeAPI {
242237
}
243238
.eraseToAnyPublisher()
244239
}
245-
#endif
246240

247241
/**
248242

@@ -358,7 +352,6 @@ open class FakeAPI {
358352
- parameter body: (body) Input number as post body (optional)
359353
- returns: AnyPublisher<Double, Error>
360354
*/
361-
#if canImport(Combine)
362355
open func fakeOuterNumberSerialize(body: Double? = nil) -> AnyPublisher<Double, Error> {
363356
let requestBuilder = fakeOuterNumberSerializeWithRequestBuilder(body: body)
364357
let requestTask = requestBuilder.requestTask
@@ -380,7 +373,6 @@ open class FakeAPI {
380373
}
381374
.eraseToAnyPublisher()
382375
}
383-
#endif
384376

385377
/**
386378

@@ -496,7 +488,6 @@ open class FakeAPI {
496488
- parameter body: (body) Input string as post body (optional)
497489
- returns: AnyPublisher<String, Error>
498490
*/
499-
#if canImport(Combine)
500491
open func fakeOuterStringSerialize(body: String? = nil) -> AnyPublisher<String, Error> {
501492
let requestBuilder = fakeOuterStringSerializeWithRequestBuilder(body: body)
502493
let requestTask = requestBuilder.requestTask
@@ -518,7 +509,6 @@ open class FakeAPI {
518509
}
519510
.eraseToAnyPublisher()
520511
}
521-
#endif
522512

523513
/**
524514

@@ -634,7 +624,6 @@ open class FakeAPI {
634624
- parameter body: (body)
635625
- returns: AnyPublisher<Void, Error>
636626
*/
637-
#if canImport(Combine)
638627
open func testBodyWithFileSchema(body: FileSchemaTestClass) -> AnyPublisher<Void, Error> {
639628
let requestBuilder = testBodyWithFileSchemaWithRequestBuilder(body: body)
640629
let requestTask = requestBuilder.requestTask
@@ -656,7 +645,6 @@ open class FakeAPI {
656645
}
657646
.eraseToAnyPublisher()
658647
}
659-
#endif
660648

661649
/**
662650

@@ -776,7 +764,6 @@ open class FakeAPI {
776764
- parameter body: (body)
777765
- returns: AnyPublisher<Void, Error>
778766
*/
779-
#if canImport(Combine)
780767
open func testBodyWithQueryParams(query: String, body: User) -> AnyPublisher<Void, Error> {
781768
let requestBuilder = testBodyWithQueryParamsWithRequestBuilder(query: query, body: body)
782769
let requestTask = requestBuilder.requestTask
@@ -798,7 +785,6 @@ open class FakeAPI {
798785
}
799786
.eraseToAnyPublisher()
800787
}
801-
#endif
802788

803789
/**
804790

@@ -923,7 +909,6 @@ open class FakeAPI {
923909
- parameter body: (body) client model
924910
- returns: AnyPublisher<Client, Error>
925911
*/
926-
#if canImport(Combine)
927912
open func testClientModel(body: Client) -> AnyPublisher<Client, Error> {
928913
let requestBuilder = testClientModelWithRequestBuilder(body: body)
929914
let requestTask = requestBuilder.requestTask
@@ -945,7 +930,6 @@ open class FakeAPI {
945930
}
946931
.eraseToAnyPublisher()
947932
}
948-
#endif
949933

950934
/**
951935
To test \"client\" model
@@ -1120,7 +1104,6 @@ open class FakeAPI {
11201104
- parameter callback: (form) None (optional)
11211105
- returns: AnyPublisher<Void, Error>
11221106
*/
1123-
#if canImport(Combine)
11241107
open func testEndpointParameters(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: Data? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil) -> AnyPublisher<Void, Error> {
11251108
let requestBuilder = testEndpointParametersWithRequestBuilder(number: number, double: double, patternWithoutDelimiter: patternWithoutDelimiter, byte: byte, integer: integer, int32: int32, int64: int64, float: float, string: string, binary: binary, date: date, dateTime: dateTime, password: password, callback: callback)
11261109
let requestTask = requestBuilder.requestTask
@@ -1142,7 +1125,6 @@ open class FakeAPI {
11421125
}
11431126
.eraseToAnyPublisher()
11441127
}
1145-
#endif
11461128

11471129
/**
11481130
Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트
@@ -1420,7 +1402,6 @@ open class FakeAPI {
14201402
- parameter enumFormString: (form) Form parameter enum test (string) (optional, default to .efg)
14211403
- returns: AnyPublisher<Void, Error>
14221404
*/
1423-
#if canImport(Combine)
14241405
open func testEnumParameters(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil) -> AnyPublisher<Void, Error> {
14251406
let requestBuilder = testEnumParametersWithRequestBuilder(enumHeaderStringArray: enumHeaderStringArray, enumHeaderString: enumHeaderString, enumQueryStringArray: enumQueryStringArray, enumQueryString: enumQueryString, enumQueryInteger: enumQueryInteger, enumQueryDouble: enumQueryDouble, enumFormStringArray: enumFormStringArray, enumFormString: enumFormString)
14261407
let requestTask = requestBuilder.requestTask
@@ -1442,7 +1423,6 @@ open class FakeAPI {
14421423
}
14431424
.eraseToAnyPublisher()
14441425
}
1445-
#endif
14461426

14471427
/**
14481428
To test enum parameters
@@ -1620,7 +1600,6 @@ open class FakeAPI {
16201600
- parameter int64Group: (query) Integer in group parameters (optional)
16211601
- returns: AnyPublisher<Void, Error>
16221602
*/
1623-
#if canImport(Combine)
16241603
open func testGroupParameters(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil) -> AnyPublisher<Void, Error> {
16251604
let requestBuilder = testGroupParametersWithRequestBuilder(requiredStringGroup: requiredStringGroup, requiredBooleanGroup: requiredBooleanGroup, requiredInt64Group: requiredInt64Group, stringGroup: stringGroup, booleanGroup: booleanGroup, int64Group: int64Group)
16261605
let requestTask = requestBuilder.requestTask
@@ -1642,7 +1621,6 @@ open class FakeAPI {
16421621
}
16431622
.eraseToAnyPublisher()
16441623
}
1645-
#endif
16461624

16471625
/**
16481626
Fake endpoint to test group parameters (optional)
@@ -1787,7 +1765,6 @@ open class FakeAPI {
17871765
- parameter param: (body) request body
17881766
- returns: AnyPublisher<Void, Error>
17891767
*/
1790-
#if canImport(Combine)
17911768
open func testInlineAdditionalProperties(param: [String: String]) -> AnyPublisher<Void, Error> {
17921769
let requestBuilder = testInlineAdditionalPropertiesWithRequestBuilder(param: param)
17931770
let requestTask = requestBuilder.requestTask
@@ -1809,7 +1786,6 @@ open class FakeAPI {
18091786
}
18101787
.eraseToAnyPublisher()
18111788
}
1812-
#endif
18131789

18141790
/**
18151791
test inline additionalProperties
@@ -1935,7 +1911,6 @@ open class FakeAPI {
19351911
- parameter param2: (form) field2
19361912
- returns: AnyPublisher<Void, Error>
19371913
*/
1938-
#if canImport(Combine)
19391914
open func testJsonFormData(param: String, param2: String) -> AnyPublisher<Void, Error> {
19401915
let requestBuilder = testJsonFormDataWithRequestBuilder(param: param, param2: param2)
19411916
let requestTask = requestBuilder.requestTask
@@ -1957,7 +1932,6 @@ open class FakeAPI {
19571932
}
19581933
.eraseToAnyPublisher()
19591934
}
1960-
#endif
19611935

19621936
/**
19631937
test json serialization of form data

‎samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/APIs/FakeClassnameTags123API.swift‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@
88
import Foundation
99
@preconcurrency import PromiseKit
1010
@preconcurrency import RxSwift
11-
#if canImport(Combine)
1211
import Combine
13-
#endif
1412

1513
open class FakeClassnameTags123API {
1614
public let apiConfiguration: PetstoreClientAPIConfiguration
@@ -86,7 +84,6 @@ open class FakeClassnameTags123API {
8684
- parameter body: (body) client model
8785
- returns: AnyPublisher<Client, Error>
8886
*/
89-
#if canImport(Combine)
9087
open func testClassname(body: Client) -> AnyPublisher<Client, Error> {
9188
let requestBuilder = testClassnameWithRequestBuilder(body: body)
9289
let requestTask = requestBuilder.requestTask
@@ -108,7 +105,6 @@ open class FakeClassnameTags123API {
108105
}
109106
.eraseToAnyPublisher()
110107
}
111-
#endif
112108

113109
/**
114110
To test class name in snake case

0 commit comments

Comments
 (0)