update generation of NetworkService and methods

Swift/NetworkService.swift.twig

@@ -2,14 +2,10 @@ import LeadKit
 import RxSwift
 
 {% set serviceName = concat(networkServiceName, "NetworkService") -%}
-class {{ serviceName }}: NetworkService, ConfigurableNetworkService {
-
-    class var baseUrl: String {
-        return "{{ apiUrl }}"
-    }
+class {{ serviceName }}: NetworkService {
 
     convenience init() {
-        self.init(sessionManager: {{ serviceName }}.sessionManager)
+        self.init(configuration: NetworkServiceConfiguration(baseUrl: "{{ apiUrl }}"))
     }
 
     func apiRequest<T: ImmutableMappable>(with parameters: ApiRequestParameters) -> Single<T> {

Swift/blocks/method/method-func.twig

@@ -12,19 +12,17 @@
 
     /// {{ method.description }}
     {{ isStatic ? "static " : "" }}func {{ funcName }}({%- if hasBody -%}{{ bodyParamName }}: {{ bodyTypeName }},{{ "\n                   " }}{%- endif -%}
-                   encoding: ParameterEncoding = URLEncoding.default,
-                   headers: HTTPHeaders? = nil) -> Single<{{ method.responseType.type.typeName }}> {
+                   requestHeaders: HTTPHeaders? = nil) -> Single<{{ method.responseType.type.typeName }}> {
 
         {% if isStatic -%}
           return shared.{{ funcName }}({%- if hasBody -%}{{ bodyParamName }}: {{ bodyParamName }},{{ "\n                   " }}{%- endif -%}
-                   encoding: encoding,
-                   headers: headers)
+                   requestHeaders: requestHeaders)
         {%- else %}
-          let parameters = ApiRequestParameters(url: "{{ method.url }}",
+          let parameters = ApiRequestParameters(url: configuration.baseUrl + "{{ method.url }}",
                                               method: .{{ methodType }},
                                               parameters: {% if hasBody -%}{{ bodyParamName }}.toJSON(){%- else -%}nil{%- endif -%},
-                                              encoding: encoding,
-                                              headers: headers)
+                                              encoding: configuration.encoding,
+                                              headers: requestHeaders)
 
           return apiRequest(with: parameters)
         {%- endif %}