diff --git a/Sources/Extensions/Alamofire/AlamofireRequest+Extensions.swift b/Sources/Extensions/Alamofire/AlamofireRequest+Extensions.swift index 86b6dd88..da192e17 100644 --- a/Sources/Extensions/Alamofire/AlamofireRequest+Extensions.swift +++ b/Sources/Extensions/Alamofire/AlamofireRequest+Extensions.swift @@ -54,7 +54,7 @@ public extension Reactive where Base: DataRequest { .observeOn(SerialDispatchQueueScheduler(queue: mappingQueue, internalSerialQueueName: mappingQueue.label)) .tryMapObservableResult { response, value in let json = try JSONSerialization.jsonObject(with: value, options: []) - return T.createFrom(decoder: decoder, jsonObject: json) + return T.create(from: json, with: decoder) .map { (response, $0) } } } diff --git a/Sources/Protocols/ObservableMappable.swift b/Sources/Protocols/ObservableMappable.swift index 3d157025..b6027d09 100644 --- a/Sources/Protocols/ObservableMappable.swift +++ b/Sources/Protocols/ObservableMappable.swift @@ -27,6 +27,6 @@ public protocol ObservableMappable { associatedtype ModelType: Decodable - static func createFrom(decoder: JSONDecoder, jsonObject: Any) -> Observable + static func create(from jsonObject: Any, with decoder: JSONDecoder) -> Observable } diff --git a/Tests/Models/Album.swift b/Tests/Models/Album.swift index 975aef29..d772afa4 100644 --- a/Tests/Models/Album.swift +++ b/Tests/Models/Album.swift @@ -47,7 +47,7 @@ extension Album: Equatable { extension Album: ObservableMappable { - static func createFrom(decoder: JSONDecoder, jsonObject: Any) -> Observable { + static func create(from jsonObject: Any, with decoder: JSONDecoder) -> Observable { return Observable.deferredJust { let data = try JSONSerialization.data(withJSONObject: jsonObject, options: []) return try decoder.decode(Album.self, from: data) diff --git a/Tests/Models/AlbumsContainer.swift b/Tests/Models/AlbumsContainer.swift index 16436892..cc1d6879 100644 --- a/Tests/Models/AlbumsContainer.swift +++ b/Tests/Models/AlbumsContainer.swift @@ -30,7 +30,7 @@ struct AlbumContainer: Decodable { extension AlbumContainer: ObservableMappable { - static func createFrom(decoder: JSONDecoder, jsonObject: Any) -> Observable { + static func create(from jsonObject: Any, with decoder: JSONDecoder) -> Observable { return Observable.deferredJust { try cast(jsonObject) as [Any] } .flatMap { $0.concurrentRxMap { json -> Album in diff --git a/Tests/Models/Post.swift b/Tests/Models/Post.swift index c2bb5e71..a277c6fe 100644 --- a/Tests/Models/Post.swift +++ b/Tests/Models/Post.swift @@ -41,7 +41,7 @@ struct Post: Decodable { extension Post: ObservableMappable { - static func createFrom(decoder: JSONDecoder, jsonObject: Any) -> Observable { + static func create(from jsonObject: Any, with decoder: JSONDecoder) -> Observable { return Observable.deferredJust { let data = try JSONSerialization.data(withJSONObject: jsonObject, options: []) return try decoder.decode(Post.self, from: data)