From 61be799de7f5feb5f12eb9fac61286462763e6a9 Mon Sep 17 00:00:00 2001
From: Madhas <bakid14@yandex.ru>
Date: Wed, 23 May 2018 20:58:22 +0300
Subject: [PATCH] correct methods and network service generation

---
 Swift/NetworkService.swift.twig      |  2 +-
 Swift/blocks/method/method-func.twig | 12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/Swift/NetworkService.swift.twig b/Swift/NetworkService.swift.twig
index 1668b23..b0949bf 100644
--- a/Swift/NetworkService.swift.twig
+++ b/Swift/NetworkService.swift.twig
@@ -11,7 +11,7 @@ class {{ serviceName }}: NetworkService {
         self.init(configuration: NetworkServiceConfiguration(baseUrl: {{ serviceName }}.apiBaseUrl))
     }
 
-    func apiRequest<T: Decodable>(with parameters: ApiRequestParameters, decoder: JSONDecoder) -> Single<T> {
+    func apiRequest<T: Decodable>(with parameters: ApiRequestParameters, decoder: JSONDecoder = JSONDecoder()) -> Single<T> {
         return rxRequest(with: parameters, decoder: decoder).map { $0.model }.asSingle()
     }
 
diff --git a/Swift/blocks/method/method-func.twig b/Swift/blocks/method/method-func.twig
index 90f6659..018dc50 100644
--- a/Swift/blocks/method/method-func.twig
+++ b/Swift/blocks/method/method-func.twig
@@ -13,23 +13,19 @@
     /// {{ method.description }}
     {{ isStatic ? "static " : "" }}func {{ funcName }}({%- if hasBody -%}{{ bodyParamName }}: {{ bodyTypeName }},{{ "\n                   " }}{%- endif -%}
                    requestEncoding: ParameterEncoding? = nil,
-                   requestHeaders: HTTPHeaders? = nil,
-                   decoder: JSONDecoder = JSONDecoder(),
-                   encoder: JSONEncoder = JSONEncoder()) -> Single<{{ method.responseType.type.typeName }}> {
+                   requestHeaders: HTTPHeaders? = nil) -> Single<{{ method.responseType.type.typeName }}> {
 
         {% if isStatic -%}
           return shared.{{ funcName }}({%- if hasBody -%}{{ bodyParamName }}: {{ bodyParamName }},{{ "\n                   " }}{%- endif -%}
                    requestEncoding: requestEncoding,
-                   requestHeaders: requestHeaders,
-                   decoder: decoder,
-                   encoder: encoder)
+                   requestHeaders: requestHeaders)
         {%- else -%}
           let parameters = apiRequestParameters(relativeUrl: "{{ method.url }}",
                                               method: .{{ methodType }},
-                                              parameters: {% if hasBody -%}{{ bodyParamName }}.toJSON(with: encoder){%- else -%}nil{%- endif -%},
+                                              parameters: {% if hasBody -%}{{ bodyParamName }}.toJSON(){%- else -%}nil{%- endif -%},
                                               requestEncoding: requestEncoding,
                                               requestHeaders: requestHeaders)
 
-          return apiRequest(with: parameters, decoder)
+          return apiRequest(with: parameters)
         {%- endif %}
     }