Skip to content
Snippets Groups Projects
Commit 4d8f9a72 authored by Dariusz Rybicki's avatar Dariusz Rybicki
Browse files

Refactor callbacks

parent 8a8eb525
No related branches found
No related tags found
2 merge requests!102Release 1.0.0,!18Update Bindings
...@@ -23,12 +23,12 @@ extension AuthCallbacks { ...@@ -23,12 +23,12 @@ extension AuthCallbacks {
extension AuthCallbacks { extension AuthCallbacks {
func makeBindingsAuthCallbacks() -> BindingsAuthCallbacksProtocol { func makeBindingsAuthCallbacks() -> BindingsAuthCallbacksProtocol {
class Handler: NSObject, BindingsAuthCallbacksProtocol { class CallbackObject: NSObject, BindingsAuthCallbacksProtocol {
init(_ callbacks: AuthCallbacks) { init(_ callback: AuthCallbacks) {
self.callbacks = callbacks self.callback = callback
} }
let callbacks: AuthCallbacks let callback: AuthCallbacks
func confirm(_ contact: Data?, receptionId: Data?, ephemeralId: Int64, roundId: Int64) { func confirm(_ contact: Data?, receptionId: Data?, ephemeralId: Int64, roundId: Int64) {
guard let contact = contact else { guard let contact = contact else {
...@@ -37,7 +37,7 @@ extension AuthCallbacks { ...@@ -37,7 +37,7 @@ extension AuthCallbacks {
guard let receptionId = receptionId else { guard let receptionId = receptionId else {
fatalError("BindingsAuthCallbacks.confirm received `nil` receptionId") fatalError("BindingsAuthCallbacks.confirm received `nil` receptionId")
} }
callbacks.handle(.confirm( callback.handle(.confirm(
contact: contact, contact: contact,
receptionId: receptionId, receptionId: receptionId,
ephemeralId: ephemeralId, ephemeralId: ephemeralId,
...@@ -52,7 +52,7 @@ extension AuthCallbacks { ...@@ -52,7 +52,7 @@ extension AuthCallbacks {
guard let receptionId = receptionId else { guard let receptionId = receptionId else {
fatalError("BindingsAuthCallbacks.request received `nil` receptionId") fatalError("BindingsAuthCallbacks.request received `nil` receptionId")
} }
callbacks.handle(.request( callback.handle(.request(
contact: contact, contact: contact,
receptionId: receptionId, receptionId: receptionId,
ephemeralId: ephemeralId, ephemeralId: ephemeralId,
...@@ -67,7 +67,7 @@ extension AuthCallbacks { ...@@ -67,7 +67,7 @@ extension AuthCallbacks {
guard let receptionId = receptionId else { guard let receptionId = receptionId else {
fatalError("BindingsAuthCallbacks.reset received `nil` receptionId") fatalError("BindingsAuthCallbacks.reset received `nil` receptionId")
} }
callbacks.handle(.reset( callback.handle(.reset(
contact: contact, contact: contact,
receptionId: receptionId, receptionId: receptionId,
ephemeralId: ephemeralId, ephemeralId: ephemeralId,
...@@ -76,6 +76,6 @@ extension AuthCallbacks { ...@@ -76,6 +76,6 @@ extension AuthCallbacks {
} }
} }
return Handler(self) return CallbackObject(self)
} }
} }
...@@ -17,7 +17,7 @@ extension ClientErrorCallback { ...@@ -17,7 +17,7 @@ extension ClientErrorCallback {
extension ClientErrorCallback { extension ClientErrorCallback {
func makeBindingsClientError() -> BindingsClientErrorProtocol { func makeBindingsClientError() -> BindingsClientErrorProtocol {
class Reporter: NSObject, BindingsClientErrorProtocol { class CallbackObject: NSObject, BindingsClientErrorProtocol {
init(_ callback: ClientErrorCallback) { init(_ callback: ClientErrorCallback) {
self.callback = callback self.callback = callback
} }
...@@ -42,6 +42,6 @@ extension ClientErrorCallback { ...@@ -42,6 +42,6 @@ extension ClientErrorCallback {
} }
} }
return Reporter(self) return CallbackObject(self)
} }
} }
...@@ -17,18 +17,18 @@ extension HealthCallback { ...@@ -17,18 +17,18 @@ extension HealthCallback {
extension HealthCallback { extension HealthCallback {
func makeBindingsHealthCallback() -> BindingsNetworkHealthCallbackProtocol { func makeBindingsHealthCallback() -> BindingsNetworkHealthCallbackProtocol {
class Callback: NSObject, BindingsNetworkHealthCallbackProtocol { class CallbackObject: NSObject, BindingsNetworkHealthCallbackProtocol {
init(_ healthCallback: HealthCallback) { init(_ callback: HealthCallback) {
self.healthCallback = healthCallback self.callback = callback
} }
let healthCallback: HealthCallback let callback: HealthCallback
func callback(_ p0: Bool) { func callback(_ p0: Bool) {
healthCallback.handle(p0) callback.handle(p0)
} }
} }
return Callback(self) return CallbackObject(self)
} }
} }
...@@ -23,29 +23,29 @@ extension Listener { ...@@ -23,29 +23,29 @@ extension Listener {
extension Listener { extension Listener {
func makeBindingsListener() -> BindingsListenerProtocol { func makeBindingsListener() -> BindingsListenerProtocol {
class Callback: NSObject, BindingsListenerProtocol { class CallbackObject: NSObject, BindingsListenerProtocol {
init(_ listener: Listener) { init(_ callback: Listener) {
self.listener = listener self.callback = callback
} }
let listener: Listener let callback: Listener
func hear(_ item: Data?) { func hear(_ item: Data?) {
guard let item = item else { guard let item = item else {
fatalError("BindingsListener.hear received `nil`") fatalError("BindingsListener.hear received `nil`")
} }
do { do {
listener.handle(try Message.decode(item)) callback.handle(try Message.decode(item))
} catch { } catch {
fatalError("BindingsListener.hear message decoding failed with error: \(error)") fatalError("BindingsListener.hear message decoding failed with error: \(error)")
} }
} }
func name() -> String { func name() -> String {
listener.name callback.name
} }
} }
return Callback(self) return CallbackObject(self)
} }
} }
...@@ -17,21 +17,21 @@ extension LogWriter { ...@@ -17,21 +17,21 @@ extension LogWriter {
extension LogWriter { extension LogWriter {
func makeBindingsLogWriter() -> BindingsLogWriterProtocol { func makeBindingsLogWriter() -> BindingsLogWriterProtocol {
class Writer: NSObject, BindingsLogWriterProtocol { class CallbackObject: NSObject, BindingsLogWriterProtocol {
init(_ writer: LogWriter) { init(_ callback: LogWriter) {
self.writer = writer self.callback = callback
} }
let writer: LogWriter let callback: LogWriter
func log(_ p0: String?) { func log(_ p0: String?) {
guard let p0 = p0 else { guard let p0 = p0 else {
fatalError("BindingsLogWriter.log received `nil`") fatalError("BindingsLogWriter.log received `nil`")
} }
writer.handle(p0) callback.handle(p0)
} }
} }
return Writer(self) return CallbackObject(self)
} }
} }
...@@ -22,7 +22,7 @@ extension MessageDeliveryCallback { ...@@ -22,7 +22,7 @@ extension MessageDeliveryCallback {
extension MessageDeliveryCallback { extension MessageDeliveryCallback {
func makeBindingsMessageDeliveryCallback() -> BindingsMessageDeliveryCallbackProtocol { func makeBindingsMessageDeliveryCallback() -> BindingsMessageDeliveryCallbackProtocol {
class Callback: NSObject, BindingsMessageDeliveryCallbackProtocol { class CallbackObject: NSObject, BindingsMessageDeliveryCallbackProtocol {
init(_ callback: MessageDeliveryCallback) { init(_ callback: MessageDeliveryCallback) {
self.callback = callback self.callback = callback
} }
...@@ -53,6 +53,6 @@ extension MessageDeliveryCallback { ...@@ -53,6 +53,6 @@ extension MessageDeliveryCallback {
} }
} }
return Callback(self) return CallbackObject(self)
} }
} }
...@@ -35,11 +35,11 @@ extension Processor { ...@@ -35,11 +35,11 @@ extension Processor {
extension Processor { extension Processor {
func makeBindingsProcessor() -> BindingsProcessorProtocol { func makeBindingsProcessor() -> BindingsProcessorProtocol {
class CallbackObject: NSObject, BindingsProcessorProtocol { class CallbackObject: NSObject, BindingsProcessorProtocol {
init(_ processor: Processor) { init(_ callback: Processor) {
self.processor = processor self.callback = callback
} }
let processor: Processor let callback: Processor
func process(_ message: Data?, receptionId: Data?, ephemeralId: Int64, roundId: Int64) { func process(_ message: Data?, receptionId: Data?, ephemeralId: Int64, roundId: Int64) {
guard let message = message else { guard let message = message else {
...@@ -48,7 +48,7 @@ extension Processor { ...@@ -48,7 +48,7 @@ extension Processor {
guard let receptionId = receptionId else { guard let receptionId = receptionId else {
fatalError("BindingsProcessor.process received `nil` receptionId") fatalError("BindingsProcessor.process received `nil` receptionId")
} }
processor.process(Callback( callback.process(Callback(
message: message, message: message,
receptionId: receptionId, receptionId: receptionId,
ephemeralId: ephemeralId, ephemeralId: ephemeralId,
...@@ -57,7 +57,7 @@ extension Processor { ...@@ -57,7 +57,7 @@ extension Processor {
} }
func string() -> String { func string() -> String {
processor.serviceTag callback.serviceTag
} }
} }
......
...@@ -17,7 +17,7 @@ extension RestlikeCallback { ...@@ -17,7 +17,7 @@ extension RestlikeCallback {
extension RestlikeCallback { extension RestlikeCallback {
func makeBindingsRestlikeCallback() -> BindingsRestlikeCallbackProtocol { func makeBindingsRestlikeCallback() -> BindingsRestlikeCallbackProtocol {
class Callback: NSObject, BindingsRestlikeCallbackProtocol { class CallbackObject: NSObject, BindingsRestlikeCallbackProtocol {
init(_ callback: RestlikeCallback) { init(_ callback: RestlikeCallback) {
self.callback = callback self.callback = callback
} }
...@@ -39,6 +39,6 @@ extension RestlikeCallback { ...@@ -39,6 +39,6 @@ extension RestlikeCallback {
} }
} }
return Callback(self) return CallbackObject(self)
} }
} }
...@@ -17,7 +17,7 @@ extension SingleUseResponse { ...@@ -17,7 +17,7 @@ extension SingleUseResponse {
extension SingleUseResponse { extension SingleUseResponse {
func makeBindingsSingleUseResponse() -> BindingsSingleUseResponseProtocol { func makeBindingsSingleUseResponse() -> BindingsSingleUseResponseProtocol {
class Response: NSObject, BindingsSingleUseResponseProtocol { class CallbackObject: NSObject, BindingsSingleUseResponseProtocol {
init(_ callback: SingleUseResponse) { init(_ callback: SingleUseResponse) {
self.callback = callback self.callback = callback
} }
...@@ -39,6 +39,6 @@ extension SingleUseResponse { ...@@ -39,6 +39,6 @@ extension SingleUseResponse {
} }
} }
return Response(self) return CallbackObject(self)
} }
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment