Skip to content

Commit 63aab9c

Browse files
author
George Nyakundi
committed
Accomodate ClientCommons Moving to BackbaseSDK
1 parent f86829c commit 63aab9c

File tree

5 files changed

+48
-3
lines changed

5 files changed

+48
-3
lines changed

boat-scaffold/src/main/templates/boat-swift5/APIs.mustache

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ import BackbaseSDK
1010
{{/useMsdkSwift}}
1111
{{^useMsdkSwift}}
1212
import Backbase
13-
{{/useMsdkSwift}}
1413
import ClientCommonGen2
14+
{{/useMsdkSwift}}
15+
1516

1617
{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} class {{moduleName}}Client: NSObject, DBSClient {
1718
{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} var dataProvider: DBSDataProvider?

boat-scaffold/src/main/templates/boat-swift5/Podspec.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ Pod::Spec.new do |s|
2626
{{/useMsdkSwift}}
2727
{{^useMsdkSwift}}
2828
s.dependency 'Backbase', '>= 9.0'
29-
{{/useMsdkSwift}}
3029
s.dependency 'ClientCommonGen2', '>= 1.0'
30+
{{/useMsdkSwift}}
3131
{{#usePromiseKit}}
3232
s.dependency 'PromiseKit/CorePromise', '>= 6.12.0'
3333
{{/usePromiseKit}}

boat-scaffold/src/main/templates/boat-swift5/api.mustache

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,14 @@
66
//
77

88
import Foundation
9+
{{#useMsdkSwift}}
10+
import BackbaseSDK
11+
{{/useMsdkSwift}}
12+
{{^useMsdkSwift}}
913
import Backbase
10-
import ClientCommonGen2{{#usePromiseKit}}
14+
import ClientCommonGen2
15+
{{/useMsdkSwift}}
16+
{{#usePromiseKit}}
1117
import PromiseKit{{/usePromiseKit}}{{#useRxSwift}}
1218
import RxSwift{{/useRxSwift}}{{#useCombine}}
1319
import Combine{{/useCombine}}
@@ -77,7 +83,12 @@ extension {{moduleName}}Client {
7783
{{#description}}
7884
/** {{description}} */{{/description}}
7985
{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} class {{classname}}: NSObject, DBSClient, {{classname}}Protocol {
86+
{{#useMsdkSwift}}
87+
public var dataProvider: BackbaseSDK.DBSDataProvider?
88+
{{/useMsdkSwift}}
89+
{{^useMsdkSwift}}
8090
public var dataProvider: DBSDataProvider?
91+
{{/useMsdkSwift}}
8192
public var baseURL: URL
8293

8394
public override init() {
@@ -284,12 +295,23 @@ extension {{moduleName}}Client {
284295
]
285296
let headerParameters = APIHelper.rejectNilHeaders(nillableHeaders){{/-last}}{{/headerParams}}
286297
guard let url = urlComponents?.url else { throw CallError.invalidUrl }
298+
{{#useMsdkSwift}}
299+
let request = try BackbaseSDK.RequestBuilder.createURLRequest(requestUrl: url,
300+
method: "{{httpMethod}}",
301+
queryParameters: {{#hasQueryParams}}queryParameters.compactMapValues({ $0 }){{/hasQueryParams}}{{^hasQueryParams}}nil{{/hasQueryParams}},
302+
bodyParameters: parameters,
303+
bodyType: {{#hasBodyParam}}{{^isMultipart}}.json{{/isMultipart}}{{/hasBodyParam}}{{^hasBodyParam}}{{#isMultipart}}.multipartForm{{/isMultipart}}{{/hasBodyParam}}{{^hasBodyParam}}{{^isMultipart}}.none{{/isMultipart}}{{/hasBodyParam}}{{#headerParams}}{{#-first}},
304+
headers: headerParameters{{/-first}}{{/headerParams}})
305+
{{/useMsdkSwift}}
306+
{{^useMsdkSwift}}
287307
let request = try ClientCommonGen2.RequestBuilder.createURLRequest(requestUrl: url,
288308
method: "{{httpMethod}}",
289309
queryParameters: {{#hasQueryParams}}queryParameters.compactMapValues({ $0 }){{/hasQueryParams}}{{^hasQueryParams}}nil{{/hasQueryParams}},
290310
bodyParameters: parameters,
291311
bodyType: {{#hasBodyParam}}{{^isMultipart}}.json{{/isMultipart}}{{/hasBodyParam}}{{^hasBodyParam}}{{#isMultipart}}.multipartForm{{/isMultipart}}{{/hasBodyParam}}{{^hasBodyParam}}{{^isMultipart}}.none{{/isMultipart}}{{/hasBodyParam}}{{#headerParams}}{{#-first}},
292312
headers: headerParameters{{/-first}}{{/headerParams}})
313+
{{/useMsdkSwift}}
314+
293315
return Call<{{#returnType}}{{#isResponseFile}}Data{{/isResponseFile}}{{^isResponseFile}}{{{returnType}}}{{/isResponseFile}}{{/returnType}}{{^returnType}}NoResponse{{/returnType}}>(dataProvider: dataProvider, request: request)
294316
}
295317
{{/hasParams}}
@@ -356,12 +378,24 @@ extension {{moduleName}}Client {
356378
]
357379
let headerParameters = APIHelper.rejectNilHeaders(nillableHeaders){{/-last}}{{/headerParams}}
358380
guard let url = urlComponents?.url else { throw CallError.invalidUrl }
381+
382+
{{#useMsdkSwift}}
383+
let request = try BackbaseSDK.RequestBuilder.createURLRequest(requestUrl: url,
384+
method: "{{httpMethod}}",
385+
queryParameters: {{#hasQueryParams}}queryParameters.compactMapValues({ $0 }){{/hasQueryParams}}{{^hasQueryParams}}nil{{/hasQueryParams}},
386+
bodyParameters: parameters,
387+
bodyType: {{#hasBodyParam}}{{^isMultipart}}.json{{/isMultipart}}{{/hasBodyParam}}{{^hasBodyParam}}{{#isMultipart}}.multipartForm{{/isMultipart}}{{/hasBodyParam}}{{^hasBodyParam}}{{^isMultipart}}.none{{/isMultipart}}{{/hasBodyParam}}{{#headerParams}}{{#-first}},
388+
headers: headerParameters{{/-first}}{{/headerParams}})
389+
{{/useMsdkSwift}}
390+
{{^useMsdkSwift}}
359391
let request = try ClientCommonGen2.RequestBuilder.createURLRequest(requestUrl: url,
360392
method: "{{httpMethod}}",
361393
queryParameters: {{#hasQueryParams}}queryParameters.compactMapValues({ $0 }){{/hasQueryParams}}{{^hasQueryParams}}nil{{/hasQueryParams}},
362394
bodyParameters: parameters,
363395
bodyType: {{#hasBodyParam}}{{^isMultipart}}.json{{/isMultipart}}{{/hasBodyParam}}{{^hasBodyParam}}{{#isMultipart}}.multipartForm{{/isMultipart}}{{/hasBodyParam}}{{^hasBodyParam}}{{^isMultipart}}.none{{/isMultipart}}{{/hasBodyParam}}{{#headerParams}}{{#-first}},
364396
headers: headerParameters{{/-first}}{{/headerParams}})
397+
{{/useMsdkSwift}}
398+
365399
return Call<{{#returnType}}{{#isResponseFile}}Data{{/isResponseFile}}{{^isResponseFile}}{{{returnType}}}{{/isResponseFile}}{{/returnType}}{{^returnType}}NoResponse{{/returnType}}>(dataProvider: dataProvider, request: request)
366400
}
367401
{{/operation}}

boat-scaffold/src/main/templates/boat-swift5/api_parameters.mustache

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,12 @@
88
// https://openapi-generator.tech
99

1010
import Foundation
11+
{{#useMsdkSwift}}
12+
import BackbaseSDK
13+
{{/useMsdkSwift}}
14+
{{^useMsdkSwift}}
1115
import ClientCommonGen2
16+
{{/useMsdkSwift}}
1217

1318
public extension {{classname}} {
1419
{{#operation}}

boat-scaffold/src/main/templates/boat-swift5/model.mustache

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,12 @@
66
//
77

88
import Foundation
9+
{{#useMsdkSwift}}
10+
import BackbaseSDK
11+
{{/useMsdkSwift}}
12+
{{^useMsdkSwift}}
913
import ClientCommonGen2
14+
{{/useMsdkSwift}}
1015

1116
{{#description}}
1217
/** {{description}} */{{/description}}

0 commit comments

Comments
 (0)