Merge branch 'master' into fix.golang.object.to.interface

Author: moshegood

.github/workflows/test-framework-java.yml

@@ -18,6 +18,9 @@ on:
       jobName:
         description: 'job name'
         required: true
+      buildCommands:
+        description: 'build commands for generated code'
+        required: true
 
 jobs:
 
@@ -137,6 +140,7 @@ jobs:
         with:
           path: generated/${{ env.JOB_NAME }}
           job-name: ${{ env.JOB_NAME }}
+          build-commands: ${{ env.BUILD_COMMANDS }}
       - id: outcome
         run: |
           echo "::set-output name=build_outcome::${{ steps.build.outcome }}"
@@ -156,3 +160,4 @@ jobs:
       JOB_NAME: ${{ github.event.inputs.jobName }}
       OPTIONS: ${{ github.event.inputs.options }}
       SPEC_URL: ${{ github.event.inputs.specUrl }}
+      BUILD_COMMANDS: ${{ github.event.inputs.buildCommands }}

modules/swagger-codegen/src/main/resources/swift5-protocol-oriented/APIHelper.mustache

@@ -0,0 +1,65 @@
+// APIHelper.swift
+//
+// Generated by swagger-codegen
+// https://github.com/swagger-api/swagger-codegen
+//
+
+import Foundation
+
+public struct APIHelper {
+    public static func rejectNil(_ source: [String:Any?]) -> [String:Any]? {
+        let destination = source.reduce(into: [String: Any]()) { (result, item) in
+            if let value = item.value {
+                result[item.key] = value
+            }
+        }
+
+        if destination.isEmpty {
+            return nil
+        }
+        return destination
+    }
+
+    public static func rejectNilHeaders(_ source: [String:Any?]) -> [String:String] {
+        return source.reduce(into: [String: String]()) { (result, item) in
+            if let collection = item.value as? Array<Any?> {
+                result[item.key] = collection.filter({ $0 != nil }).map{ "\($0!)" }.joined(separator: ",")
+            } else if let value: Any = item.value {
+                result[item.key] = "\(value)"
+            }
+        }
+    }
+
+    public static func convertBoolToString(_ source: [String: Any]?) -> [String:Any]? {
+        guard let source = source else {
+            return nil
+        }
+
+        return source.reduce(into: [String: Any](), { (result, item) in
+            switch item.value {
+            case let x as Bool:
+                result[item.key] = x.description
+            default:
+                result[item.key] = item.value
+            }
+        })
+    }
+
+
+    public static func mapValuesToQueryItems(_ source: [String:Any?]) -> [URLQueryItem]? {
+        let destination = source.filter({ $0.value != nil}).reduce(into: [URLQueryItem]()) { (result, item) in
+            if let collection = item.value as? Array<Any?> {
+                let value = collection.filter({ $0 != nil }).map({"\($0!)"}).joined(separator: ",")
+                result.append(URLQueryItem(name: item.key, value: value))
+            } else if let value = item.value {
+                result.append(URLQueryItem(name: item.key, value: "\(value)"))
+            }
+        }
+
+        if destination.isEmpty {
+            return nil
+        }
+        return destination
+    }
+}
+

modules/swagger-codegen/src/main/resources/swift5-protocol-oriented/APIs.mustache

@@ -0,0 +1,61 @@
+// APIs.swift
+//
+// Generated by swagger-codegen
+// https://github.com/swagger-api/swagger-codegen
+//
+
+import Foundation
+
+open class {{projectName}}API {
+    public static var basePath = "{{{basePath}}}"
+    public static var credential: URLCredential?
+    public static var customHeaders: [String:String] = [:]
+    public static var requestBuilderFactory: RequestBuilderFactory = AlamofireRequestBuilderFactory()
+}
+
+open class RequestBuilder<T> {
+    var credential: URLCredential?
+    var headers: [String:String]
+    public let parameters: [String:Any]?
+    public let isBody: Bool
+    public let method: String
+    public let URLString: String
+
+    /// Optional block to obtain a reference to the request's progress instance when available.
+    public var onProgressReady: ((Progress) -> ())?
+
+    required public init(method: String, URLString: String, parameters: [String:Any]?, isBody: Bool, headers: [String:String] = [:]) {
+        self.method = method
+        self.URLString = URLString
+        self.parameters = parameters
+        self.isBody = isBody
+        self.headers = headers
+
+        addHeaders({{projectName}}API.customHeaders)
+    }
+
+    open func addHeaders(_ aHeaders:[String:String]) {
+        for (header, value) in aHeaders {
+            headers[header] = value
+        }
+    }
+
+    open func execute(_ completion: @escaping (_ response: Response<T>?, _ error: Error?) -> Void) { }
+
+    public func addHeader(name: String, value: String) -> Self {
+        if !value.isEmpty {
+            headers[name] = value
+        }
+        return self
+    }
+
+    open func addCredential() -> Self {
+        self.credential = {{projectName}}API.credential
+        return self
+    }
+}
+
+public protocol RequestBuilderFactory {
+    func getNonDecodableBuilder<T>() -> RequestBuilder<T>.Type
+    func getBuilder<T:Decodable>() -> RequestBuilder<T>.Type
+}