mbrucedogs/mvm_core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

code review

Browse Source
This commit is contained in:
Suresh, Kamlesh 2021-01-20 11:52:58 -05:00
parent 5fda7b15b5
commit dcd2dc4fd8
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MVMCore/MVMCore/ActionHandling/ActionHandler+ClientParameters.swift
View File

@ -31,7 +31,7 @@ public extension MVMCoreActionHandler {
} }
do { do {
try ClientParameterRegistry().getParameters(with: clientParameters) { (clientParams) in try MVMCoreObject.sharedInstance()?.clientParameterRegistry?.getParameters(with: clientParameters) { (clientParams) in
guard let clientParams = clientParams else { guard let clientParams = clientParams else {
stopLoadingOverlay() stopLoadingOverlay()
completionHandler(actionMapWithClientParameters) completionHandler(actionMapWithClientParameters)

8
MVMCore/MVMCore/Models/ActionType/Client Parameters/ClientParameterRegistry.swift
View File

@ -49,8 +49,7 @@ import Foundation
/// completionHandler can return flat dictinary or a map. It depends on the paramters handler /// completionHandler can return flat dictinary or a map. It depends on the paramters handler
func getParameters(with clientParameters: [String: Any], completionHandler:@escaping ([String: Any]?) -> ()) throws { func getParameters(with clientParameters: [String: Any], completionHandler:@escaping ([String: Any]?) -> ()) throws {
guard let clientParameterRegistry = MVMCoreObject.sharedInstance()?.clientParameterRegistry, guard let clientParameterModel = try ClientParameterRegistry.getClientParameterModel(clientParameters) else {
let clientParameterModel = try ClientParameterRegistry.getClientParameterModel(clientParameters) else {
completionHandler(nil) completionHandler(nil)
return return
} }
@ -63,7 +62,8 @@ import Foundation
let defaultErrorString = "failed_to_collect." let defaultErrorString = "failed_to_collect."
// Dispatch setup on queue to ensure setup is complete before completion callbacks. // Dispatch setup on queue to ensure setup is complete before completion callbacks.
parametersWorkQueue.async(group: group, qos: .userInitiated) { parametersWorkQueue.async(group: group, qos: .userInitiated) { [weak self] in
guard let self = self else { return }
// Setup completion handlers. Barriered to ensure one happens after the other. // Setup completion handlers. Barriered to ensure one happens after the other.
var complete = false var complete = false
let timeoutWorkItem = DispatchWorkItem(qos: .userInitiated) { let timeoutWorkItem = DispatchWorkItem(qos: .userInitiated) {
@ -87,7 +87,7 @@ import Foundation
parametersList[parameterModel.type] = ["error": defaultErrorString] parametersList[parameterModel.type] = ["error": defaultErrorString]
group.enter() group.enter()
// Dispatch asynchronous injection. // Dispatch asynchronous injection.
clientParameterRegistry.getParameterFromHandler(parameterModel, before: timeout) { (receivedParameter) in self.getParameterFromHandler(parameterModel, before: timeout) { (receivedParameter) in
// Queue the results for merge. // Queue the results for merge.
parametersWorkQueue.async { parametersWorkQueue.async {
if let receivedParameter = receivedParameter { if let receivedParameter = receivedParameter {