Merge pull request #3 from Mindera/openapi-generator-6.0.1-update

Update OpenAPI Generator dependency to version 6.0.1
Mindera · Jul 6, 2022 · a45b04f · a45b04f
2 parents 39184fd + 611185e
commit a45b04f
Show file tree

Hide file tree

Showing 32 changed files with 33 additions and 23 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <artifactId>mindera-openapi-generator</artifactId>
     <packaging>jar</packaging>
     <name>mindera-openapi-generator</name>
-    <version>4.0.0</version>
+    <version>4.0.1</version>
     <build>
     </build>
     <dependencies>
@@ -40,7 +40,7 @@
         <maven.compiler.target>1.8</maven.compiler.target>
         <testng-version>7.5</testng-version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <openapi-generator-version>6.0.0</openapi-generator-version>
+        <openapi-generator-version>6.0.1</openapi-generator-version>
         <mockito-version>4.5.1</mockito-version>
     </properties>
 </project>
diff --git a/src/main/java/com/mindera/openapi/generator/Swift5ClientCodegen.java b/src/main/java/com/mindera/openapi/generator/Swift5ClientCodegen.java
@@ -22,6 +22,8 @@ public class Swift5ClientCodegen extends org.openapitools.codegen.languages.Swif
     public Swift5ClientCodegen() {
         super();
 
+        embeddedTemplateDir = templateDir = "mindera-swift5";
+
         this.typeMapping.put("date", "DateWithoutTime");
         this.typeMapping.put("Date", "DateWithoutTime");
         this.typeMapping.put("DateTime", "DateWithTime");

diff --git a/src/main/resources/Swift5/APIHelper.mustache → ...sources/mindera-swift5/APIHelper.mustache b/src/main/resources/Swift5/APIHelper.mustache → ...sources/mindera-swift5/APIHelper.mustache
diff --git a/src/main/resources/Swift5/APIs.mustache → ...in/resources/mindera-swift5/APIs.mustache b/src/main/resources/Swift5/APIs.mustache → ...in/resources/mindera-swift5/APIs.mustache
diff --git a/.../Swift5/AlamofireImplementations.mustache → ...-swift5/AlamofireImplementations.mustache b/.../Swift5/AlamofireImplementations.mustache → ...-swift5/AlamofireImplementations.mustache
diff --git a/src/main/resources/Swift5/Cartfile.mustache → ...esources/mindera-swift5/Cartfile.mustache b/src/main/resources/Swift5/Cartfile.mustache → ...esources/mindera-swift5/Cartfile.mustache
diff --git a/...n/resources/Swift5/CodableHelper.mustache → ...ces/mindera-swift5/CodableHelper.mustache b/...n/resources/Swift5/CodableHelper.mustache → ...ces/mindera-swift5/CodableHelper.mustache
diff --git a/...n/resources/Swift5/Configuration.mustache → ...ces/mindera-swift5/Configuration.mustache b/...n/resources/Swift5/Configuration.mustache → ...ces/mindera-swift5/Configuration.mustache
diff --git a/...main/resources/Swift5/Extensions.mustache → ...ources/mindera-swift5/Extensions.mustache b/...main/resources/Swift5/Extensions.mustache → ...ources/mindera-swift5/Extensions.mustache
diff --git a/...esources/Swift5/JSONDataEncoding.mustache → .../mindera-swift5/JSONDataEncoding.mustache b/...esources/Swift5/JSONDataEncoding.mustache → .../mindera-swift5/JSONDataEncoding.mustache
diff --git a/...ources/Swift5/JSONEncodingHelper.mustache → ...indera-swift5/JSONEncodingHelper.mustache b/...ources/Swift5/JSONEncodingHelper.mustache → ...indera-swift5/JSONEncodingHelper.mustache
diff --git a/src/main/resources/Swift5/Models.mustache → .../resources/mindera-swift5/Models.mustache b/src/main/resources/Swift5/Models.mustache → .../resources/mindera-swift5/Models.mustache
diff --git a/.../Swift5/OpenISO8601DateFormatter.mustache → ...-swift5/OpenISO8601DateFormatter.mustache b/.../Swift5/OpenISO8601DateFormatter.mustache → ...-swift5/OpenISO8601DateFormatter.mustache
diff --git a/...n/resources/Swift5/Package.swift.mustache → ...ces/mindera-swift5/Package.swift.mustache b/...n/resources/Swift5/Package.swift.mustache → ...ces/mindera-swift5/Package.swift.mustache
diff --git a/src/main/resources/Swift5/Podspec.mustache → ...resources/mindera-swift5/Podspec.mustache b/src/main/resources/Swift5/Podspec.mustache → ...resources/mindera-swift5/Podspec.mustache
diff --git a/src/main/resources/Swift5/README.mustache → .../resources/mindera-swift5/README.mustache b/src/main/resources/Swift5/README.mustache → .../resources/mindera-swift5/README.mustache
diff --git a/...es/Swift5/SynchronizedDictionary.mustache → ...ra-swift5/SynchronizedDictionary.mustache b/...es/Swift5/SynchronizedDictionary.mustache → ...ra-swift5/SynchronizedDictionary.mustache
diff --git a/src/main/resources/Swift5/XcodeGen.mustache → ...esources/mindera-swift5/XcodeGen.mustache b/src/main/resources/Swift5/XcodeGen.mustache → ...esources/mindera-swift5/XcodeGen.mustache
diff --git a/src/main/resources/Swift5/_param.mustache → .../resources/mindera-swift5/_param.mustache b/src/main/resources/Swift5/_param.mustache → .../resources/mindera-swift5/_param.mustache
diff --git a/src/main/resources/Swift5/api.mustache → ...ain/resources/mindera-swift5/api.mustache b/src/main/resources/Swift5/api.mustache → ...ain/resources/mindera-swift5/api.mustache
@@ -97,13 +97,13 @@ extension {{projectName}}API {
      {{{.}}}
      {{/summary}}{{#allParams}}
      - parameter {{paramName}}: ({{#isFormParam}}form{{/isFormParam}}{{#isQueryParam}}query{{/isQueryParam}}{{#isPathParam}}path{{/isPathParam}}{{#isHeaderParam}}header{{/isHeaderParam}}{{#isBodyParam}}body{{/isBodyParam}}) {{description}} {{^required}}(optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}{{/allParams}}
-     - returns: Promise<{{{returnType}}}{{^returnType}}Void{{/returnType}}>
+     - returns: Promise<{{{returnType}}}{{#returnType}}{{#isResponseOptional}}?{{/isResponseOptional}}{{/returnType}}{{^returnType}}Void{{/returnType}}>
      */
     {{#isDeprecated}}
     @available(*, deprecated, message: "This operation is deprecated.")
     {{/isDeprecated}}
-    {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} class func {{operationId}}({{#allParams}} {{paramName}}: {{#isEnum}}{{#isContainer}}[{{enumName}}_{{operationId}}]{{/isContainer}}{{^isContainer}}{{enumName}}_{{operationId}}{{/isContainer}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{^required}}? = nil{{/required}}{{^-last}}, {{/-last}}{{/allParams}}) -> Promise<{{{returnType}}}{{^returnType}}Void{{/returnType}}> {
-        let deferred = Promise<{{{returnType}}}{{^returnType}}Void{{/returnType}}>.pending()
+    {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} class func {{operationId}}({{#allParams}} {{paramName}}: {{#isEnum}}{{#isContainer}}[{{enumName}}_{{operationId}}]{{/isContainer}}{{^isContainer}}{{enumName}}_{{operationId}}{{/isContainer}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{^required}}? = nil{{/required}}{{^-last}}, {{/-last}}{{/allParams}}) -> Promise<{{{returnType}}}{{#returnType}}{{#isResponseOptional}}?{{/isResponseOptional}}{{/returnType}}{{^returnType}}Void{{/returnType}}> {
+        let deferred = Promise<{{{returnType}}}{{#returnType}}{{#isResponseOptional}}?{{/isResponseOptional}}{{/returnType}}{{^returnType}}Void{{/returnType}}>.pending()
         {{operationId}}WithRequestBuilder({{#allParams}}{{paramName}}: {{paramName}}{{^-last}}, {{/-last}}{{/allParams}}).execute { result in
             switch result {
             {{#returnType}}
@@ -129,12 +129,12 @@ extension {{projectName}}API {
      {{/summary}}{{#allParams}}
      - parameter {{paramName}}: ({{#isFormParam}}form{{/isFormParam}}{{#isQueryParam}}query{{/isQueryParam}}{{#isPathParam}}path{{/isPathParam}}{{#isHeaderParam}}header{{/isHeaderParam}}{{#isBodyParam}}body{{/isBodyParam}}) {{description}} {{^required}}(optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}{{/allParams}}
      - parameter apiResponseQueue: The queue on which api response is dispatched.
-     - returns: Observable<{{{returnType}}}{{^returnType}}Void{{/returnType}}>
+     - returns: Observable<{{{returnType}}}{{#returnType}}{{#isResponseOptional}}?{{/isResponseOptional}}{{/returnType}}{{^returnType}}Void{{/returnType}}>
      */
     {{#isDeprecated}}
     @available(*, deprecated, message: "This operation is deprecated.")
     {{/isDeprecated}}
-    {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} class func {{operationId}}({{#allParams}}{{paramName}}: {{#isEnum}}{{#isContainer}}[{{enumName}}_{{operationId}}]{{/isContainer}}{{^isContainer}}{{enumName}}_{{operationId}}{{/isContainer}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{^required}}? = nil{{/required}}{{^-last}}, {{/-last}}{{/allParams}}{{#hasParams}}, {{/hasParams}}apiResponseQueue: DispatchQueue = {{projectName}}API.apiResponseQueue) -> Observable<{{{returnType}}}{{^returnType}}Void{{/returnType}}> {
+    {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} class func {{operationId}}({{#allParams}}{{paramName}}: {{#isEnum}}{{#isContainer}}[{{enumName}}_{{operationId}}]{{/isContainer}}{{^isContainer}}{{enumName}}_{{operationId}}{{/isContainer}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{^required}}? = nil{{/required}}{{^-last}}, {{/-last}}{{/allParams}}{{#hasParams}}, {{/hasParams}}apiResponseQueue: DispatchQueue = {{projectName}}API.apiResponseQueue) -> Observable<{{{returnType}}}{{#returnType}}{{#isResponseOptional}}?{{/isResponseOptional}}{{/returnType}}{{^returnType}}Void{{/returnType}}> {
         return Observable.create { observer -> Disposable in
             let requestTask = {{operationId}}WithRequestBuilder({{#allParams}}{{paramName}}: {{paramName}}{{^-last}}, {{/-last}}{{/allParams}}).execute(apiResponseQueue) { result in
                 switch result {
@@ -165,16 +165,16 @@ extension {{projectName}}API {
      {{{.}}}
      {{/summary}}{{#allParams}}
      - parameter {{paramName}}: ({{#isFormParam}}form{{/isFormParam}}{{#isQueryParam}}query{{/isQueryParam}}{{#isPathParam}}path{{/isPathParam}}{{#isHeaderParam}}header{{/isHeaderParam}}{{#isBodyParam}}body{{/isBodyParam}}) {{description}} {{^required}}(optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}{{/allParams}}
-     - returns: AnyPublisher<{{{returnType}}}{{^returnType}}Void{{/returnType}}, Error>
+     - returns: AnyPublisher<{{{returnType}}}{{#returnType}}{{#isResponseOptional}}?{{/isResponseOptional}}{{/returnType}}{{^returnType}}Void{{/returnType}}, Error>
      */
     #if canImport(Combine)
     {{#isDeprecated}}
     @available(*, deprecated, message: "This operation is deprecated.")
     {{/isDeprecated}}
     @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-    {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} class func {{operationId}}({{#allParams}}{{paramName}}: {{#isEnum}}{{#isContainer}}[{{enumName}}_{{operationId}}]{{/isContainer}}{{^isContainer}}{{enumName}}_{{operationId}}{{/isContainer}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{^required}}? = nil{{/required}}{{^-last}}, {{/-last}}{{/allParams}}) -> AnyPublisher<{{{returnType}}}{{^returnType}}Void{{/returnType}}, Error> {
+    {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} class func {{operationId}}({{#allParams}}{{paramName}}: {{#isEnum}}{{#isContainer}}[{{enumName}}_{{operationId}}]{{/isContainer}}{{^isContainer}}{{enumName}}_{{operationId}}{{/isContainer}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{^required}}? = nil{{/required}}{{^-last}}, {{/-last}}{{/allParams}}) -> AnyPublisher<{{{returnType}}}{{#returnType}}{{#isResponseOptional}}?{{/isResponseOptional}}{{/returnType}}{{^returnType}}Void{{/returnType}}, Error> {
         var requestTask: RequestTask?
-        return Future<{{{returnType}}}{{^returnType}}Void{{/returnType}}, Error> { promise in
+        return Future<{{{returnType}}}{{#returnType}}{{#isResponseOptional}}?{{/isResponseOptional}}{{/returnType}}{{^returnType}}Void{{/returnType}}, Error> { promise in
             requestTask = {{operationId}}WithRequestBuilder({{#allParams}}{{paramName}}: {{paramName}}{{^-last}}, {{/-last}}{{/allParams}}).execute { result in
                 switch result {
                 {{#returnType}}
@@ -204,13 +204,13 @@ extension {{projectName}}API {
      {{{.}}}
      {{/summary}}{{#allParams}}
      - parameter {{paramName}}: ({{#isFormParam}}form{{/isFormParam}}{{#isQueryParam}}query{{/isQueryParam}}{{#isPathParam}}path{{/isPathParam}}{{#isHeaderParam}}header{{/isHeaderParam}}{{#isBodyParam}}body{{/isBodyParam}}) {{description}} {{^required}}(optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}{{/allParams}}
-     - returns: {{{returnType}}}{{^returnType}}Void{{/returnType}}
+     - returns: {{{returnType}}}{{#returnType}}{{#isResponseOptional}}?{{/isResponseOptional}}{{/returnType}}{{^returnType}}Void{{/returnType}}
      */
     {{#isDeprecated}}
     @available(*, deprecated, message: "This operation is deprecated.")
     {{/isDeprecated}}
     @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-    {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} class func {{operationId}}({{#allParams}}{{paramName}}: {{#isEnum}}{{#isContainer}}[{{enumName}}_{{operationId}}]{{/isContainer}}{{^isContainer}}{{enumName}}_{{operationId}}{{/isContainer}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{^required}}? = nil{{/required}}{{^-last}}, {{/-last}}{{/allParams}}) async throws{{#returnType}} -> {{{returnType}}}{{/returnType}} {
+    {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} class func {{operationId}}({{#allParams}}{{paramName}}: {{#isEnum}}{{#isContainer}}[{{enumName}}_{{operationId}}]{{/isContainer}}{{^isContainer}}{{enumName}}_{{operationId}}{{/isContainer}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{^required}}? = nil{{/required}}{{^-last}}, {{/-last}}{{/allParams}}) async throws{{#returnType}} -> {{{returnType}}}{{#returnType}}{{#isResponseOptional}}?{{/isResponseOptional}}{{/returnType}}{{/returnType}} {
         var requestTask: RequestTask?
         return try await withTaskCancellationHandler {
             try Task.checkCancellation()
@@ -254,7 +254,7 @@ extension {{projectName}}API {
     @available(*, deprecated, message: "This operation is deprecated.")
     {{/isDeprecated}}
     @discardableResult
-    {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} class func {{operationId}}({{#allParams}}{{paramName}}: {{#isEnum}}{{#isContainer}}[{{enumName}}_{{operationId}}]{{/isContainer}}{{^isContainer}}{{enumName}}_{{operationId}}{{/isContainer}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{^required}}? = nil{{/required}}{{^-last}}, {{/-last}}{{/allParams}}{{#hasParams}}, {{/hasParams}}apiResponseQueue: DispatchQueue = {{projectName}}API.apiResponseQueue, completion: @escaping ((_ result: Swift.Result<{{{returnType}}}{{^returnType}}Void{{/returnType}}, ErrorResponse>) -> Void)) -> RequestTask {
+    {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} class func {{operationId}}({{#allParams}}{{paramName}}: {{#isEnum}}{{#isContainer}}[{{enumName}}_{{operationId}}]{{/isContainer}}{{^isContainer}}{{enumName}}_{{operationId}}{{/isContainer}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{^required}}? = nil{{/required}}{{^-last}}, {{/-last}}{{/allParams}}{{#hasParams}}, {{/hasParams}}apiResponseQueue: DispatchQueue = {{projectName}}API.apiResponseQueue, completion: @escaping ((_ result: Swift.Result<{{{returnType}}}{{#returnType}}{{#isResponseOptional}}?{{/isResponseOptional}}{{/returnType}}{{^returnType}}Void{{/returnType}}, ErrorResponse>) -> Void)) -> RequestTask {
         return {{operationId}}WithRequestBuilder({{#allParams}}{{paramName}}: {{paramName}}{{^-last}}, {{/-last}}{{/allParams}}).execute(apiResponseQueue) { result in
             switch result {
             {{#returnType}}
@@ -419,12 +419,12 @@ extension {{projectName}}API {
      {{#allParams}}
      - parameter {{paramName}}: ({{#isFormParam}}form{{/isFormParam}}{{#isQueryParam}}query{{/isQueryParam}}{{#isPathParam}}path{{/isPathParam}}{{#isHeaderParam}}header{{/isHeaderParam}}{{#isBodyParam}}body{{/isBodyParam}}) {{description}} {{^required}}(optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}
      {{/allParams}}
-     - returns: RequestBuilder<{{{returnType}}}{{^returnType}}Void{{/returnType}}> {{description}}
+     - returns: RequestBuilder<{{{returnType}}}{{#returnType}}{{#isResponseOptional}}?{{/isResponseOptional}}{{/returnType}}{{^returnType}}Void{{/returnType}}> {{description}}
      */
     {{#isDeprecated}}
     @available(*, deprecated, message: "This operation is deprecated.")
     {{/isDeprecated}}
-    {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} class func {{operationId}}WithRequestBuilder({{#allParams}}{{paramName}}: {{#isEnum}}{{#isContainer}}[{{enumName}}_{{operationId}}]{{/isContainer}}{{^isContainer}}{{enumName}}_{{operationId}}{{/isContainer}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{^required}}? = nil{{/required}}{{^-last}}, {{/-last}}{{/allParams}}) -> RequestBuilder<{{{returnType}}}{{^returnType}}Void{{/returnType}}> {
+    {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} class func {{operationId}}WithRequestBuilder({{#allParams}}{{paramName}}: {{#isEnum}}{{#isContainer}}[{{enumName}}_{{operationId}}]{{/isContainer}}{{^isContainer}}{{enumName}}_{{operationId}}{{/isContainer}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{^required}}? = nil{{/required}}{{^-last}}, {{/-last}}{{/allParams}}) -> RequestBuilder<{{{returnType}}}{{#returnType}}{{#isResponseOptional}}?{{/isResponseOptional}}{{/returnType}}{{^returnType}}Void{{/returnType}}> {
         {{^pathParams}}let{{/pathParams}}{{#pathParams}}{{#-first}}var{{/-first}}{{/pathParams}} localVariablePath = "{{{path}}}"{{#pathParams}}
         let {{paramName}}PreEscape = "\({{#isEnum}}{{paramName}}{{#isContainer}}{{{dataType}}}{{/isContainer}}{{^isContainer}}.rawValue{{/isContainer}}{{/isEnum}}{{^isEnum}}APIHelper.mapValueToPathItem({{paramName}}){{/isEnum}})"
         let {{paramName}}PostEscape = {{paramName}}PreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
@@ -464,7 +464,7 @@ extension {{projectName}}API {
 
         let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders)
 
-        let localVariableRequestBuilder: RequestBuilder<{{{returnType}}}{{^returnType}}Void{{/returnType}}>.Type = {{projectName}}API.requestBuilderFactory.{{#returnType}}getBuilder(){{/returnType}}{{^returnType}}getNonDecodableBuilder(){{/returnType}}
+        let localVariableRequestBuilder: RequestBuilder<{{{returnType}}}{{#returnType}}{{#isResponseOptional}}?{{/isResponseOptional}}{{/returnType}}{{^returnType}}Void{{/returnType}}>.Type = {{projectName}}API.requestBuilderFactory.{{#returnType}}getBuilder(){{/returnType}}{{^returnType}}getNonDecodableBuilder(){{/returnType}}
 
         return localVariableRequestBuilder.init(method: "{{httpMethod}}", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters)
     }

diff --git a/src/main/resources/Swift5/api_doc.mustache → ...resources/mindera-swift5/api_doc.mustache b/src/main/resources/Swift5/api_doc.mustache → ...resources/mindera-swift5/api_doc.mustache
diff --git a/...ain/resources/Swift5/git_push.sh.mustache → ...urces/mindera-swift5/git_push.sh.mustache b/...ain/resources/Swift5/git_push.sh.mustache → ...urces/mindera-swift5/git_push.sh.mustache
diff --git a/src/main/resources/Swift5/gitignore.mustache → ...sources/mindera-swift5/gitignore.mustache b/src/main/resources/Swift5/gitignore.mustache → ...sources/mindera-swift5/gitignore.mustache
diff --git a/...amofire/AlamofireImplementations.mustache → ...amofire/AlamofireImplementations.mustache b/...amofire/AlamofireImplementations.mustache → ...amofire/AlamofireImplementations.mustache
@@ -347,13 +347,17 @@ private var managerStore = SynchronizedDictionary<String, Alamofire.Session>()
                     return
                 }
 
-                guard let data = dataResponse.data, !data.isEmpty else {
-                    completion(.failure(ErrorResponse.error(-1, nil, dataResponse.response, DecodableRequestBuilderError.emptyDataResponse)))
+                guard let httpResponse = dataResponse.response else {
+                    completion(.failure(ErrorResponse.error(-2, nil, dataResponse.response, DecodableRequestBuilderError.nilHTTPResponse)))
                     return
                 }
 
-                guard let httpResponse = dataResponse.response else {
-                    completion(.failure(ErrorResponse.error(-2, nil, dataResponse.response, DecodableRequestBuilderError.nilHTTPResponse)))
+                guard let data = dataResponse.data, !data.isEmpty else {
+                    if T.self is ExpressibleByNilLiteral.Type {
+                        completion(.success(Response(response: httpResponse, body: Optional<T>.none as! T)))
+                    } else {
+                        completion(.failure(ErrorResponse.error(httpResponse.statusCode, nil, httpResponse, DecodableRequestBuilderError.emptyDataResponse)))
+                    }
                     return
                 }
 

diff --git a/...ession/URLSessionImplementations.mustache → ...ession/URLSessionImplementations.mustache b/...ession/URLSessionImplementations.mustache → ...ession/URLSessionImplementations.mustache
@@ -353,7 +353,11 @@ private var credentialStore = SynchronizedDictionary<Int, URLCredential>()
         default:
 
             guard let data = data, !data.isEmpty else {
-                completion(.failure(ErrorResponse.error(httpResponse.statusCode, nil, response, DecodableRequestBuilderError.emptyDataResponse)))
+                if T.self is ExpressibleByNilLiteral.Type {
+                    completion(.success(Response(response: httpResponse, body: Optional<T>.none as! T)))
+                } else {
+                    completion(.failure(ErrorResponse.error(httpResponse.statusCode, nil, response, DecodableRequestBuilderError.emptyDataResponse)))
+                }
                 return
             }
 

diff --git a/src/main/resources/Swift5/model.mustache → ...n/resources/mindera-swift5/model.mustache b/src/main/resources/Swift5/model.mustache → ...n/resources/mindera-swift5/model.mustache
diff --git a/...main/resources/Swift5/modelArray.mustache → ...ources/mindera-swift5/modelArray.mustache b/...main/resources/Swift5/modelArray.mustache → ...ources/mindera-swift5/modelArray.mustache
diff --git a/src/main/resources/Swift5/modelEnum.mustache → ...sources/mindera-swift5/modelEnum.mustache b/src/main/resources/Swift5/modelEnum.mustache → ...sources/mindera-swift5/modelEnum.mustache
diff --git a/...wift5/modelInlineEnumDeclaration.mustache → ...wift5/modelInlineEnumDeclaration.mustache b/...wift5/modelInlineEnumDeclaration.mustache → ...wift5/modelInlineEnumDeclaration.mustache
diff --git a/...ain/resources/Swift5/modelObject.mustache → ...urces/mindera-swift5/modelObject.mustache b/...ain/resources/Swift5/modelObject.mustache → ...urces/mindera-swift5/modelObject.mustache
@@ -1,5 +1,5 @@
-{{^objcCompatible}}{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} {{#useClasses}}final class{{/useClasses}}{{^useClasses}}struct{{/useClasses}} {{{classname}}}: {{#useVapor}}Content{{/useVapor}}{{^useVapor}}Codable, JSONEncodable{{/useVapor}}{{#vendorExtensions.x-swift-hashable}}, Hashable{{/vendorExtensions.x-swift-hashable}} {
-{{/objcCompatible}}{{#objcCompatible}}@objc {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} class {{classname}}: NSObject, Codable, JSONEncodable {
+{{^objcCompatible}}{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} {{#useClasses}}final class{{/useClasses}}{{^useClasses}}struct{{/useClasses}} {{{classname}}}: {{#useVapor}}Content{{/useVapor}}{{^useVapor}}Codable{{#useJsonEncodable}}, JSONEncodable{{/useJsonEncodable}}{{/useVapor}}{{#vendorExtensions.x-swift-hashable}}, Hashable{{/vendorExtensions.x-swift-hashable}} {
+{{/objcCompatible}}{{#objcCompatible}}@objc {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} class {{classname}}: NSObject, Codable{{#useJsonEncodable}}, JSONEncodable{{/useJsonEncodable}} {
 {{/objcCompatible}}
 
 {{#allVars}}

diff --git a/...main/resources/Swift5/modelOneOf.mustache → ...ources/mindera-swift5/modelOneOf.mustache b/...main/resources/Swift5/modelOneOf.mustache → ...ources/mindera-swift5/modelOneOf.mustache
diff --git a/src/main/resources/Swift5/model_doc.mustache → ...sources/mindera-swift5/model_doc.mustache b/src/main/resources/Swift5/model_doc.mustache → ...sources/mindera-swift5/model_doc.mustache