Merge branch 'cleanup-operations-interface'

15 files changed, 26 insertions, 31 deletions

diff --git a/ios/Operations/AsyncBlockOperation.swift b/ios/Operations/AsyncBlockOperation.swift
index 72b95c98a3..e23b138d53 100644
--- a/ios/Operations/AsyncBlockOperation.swift
+++ b/ios/Operations/AsyncBlockOperation.swift
@@ -1,6 +1,6 @@
 //
 //  AsyncBlockOperation.swift
-//  MullvadVPN
+//  Operations
 //
 //  Created by pronebird on 06/07/2020.
 //  Copyright © 2020 Mullvad VPN AB. All rights reserved.
diff --git a/ios/Operations/AsyncOperation.swift b/ios/Operations/AsyncOperation.swift
index a8aa4262a8..61630573d3 100644
--- a/ios/Operations/AsyncOperation.swift
+++ b/ios/Operations/AsyncOperation.swift
@@ -1,6 +1,6 @@
 //
 //  AsyncOperation.swift
-//  MullvadVPN
+//  Operations
 //
 //  Created by pronebird on 01/06/2020.
 //  Copyright © 2020 Mullvad VPN AB. All rights reserved.
@@ -409,25 +409,19 @@ open class AsyncOperation: Operation {
     }
 }
 
-public extension Operation {
-    func addDependencies(_ dependencies: [Operation]) {
+extension Operation {
+    public func addDependencies(_ dependencies: [Operation]) {
         for dependency in dependencies {
             addDependency(dependency)
         }
     }
 }
 
-public extension Operation {
-    var operationName: String {
-        return name ?? "\(self)"
-    }
-}
-
 public protocol OperationBlockObserverSupport {}
 extension AsyncOperation: OperationBlockObserverSupport {}
 
-public extension OperationBlockObserverSupport where Self: AsyncOperation {
-    func addBlockObserver(_ observer: OperationBlockObserver<Self>) {
+extension OperationBlockObserverSupport where Self: AsyncOperation {
+    public func addBlockObserver(_ observer: OperationBlockObserver<Self>) {
         addObserver(observer)
     }
 }
diff --git a/ios/Operations/AsyncOperationQueue.swift b/ios/Operations/AsyncOperationQueue.swift
index 1c62038671..f454340a45 100644
--- a/ios/Operations/AsyncOperationQueue.swift
+++ b/ios/Operations/AsyncOperationQueue.swift
@@ -1,6 +1,6 @@
 //
 //  AsyncOperationQueue.swift
-//  MullvadVPN
+//  Operations
 //
 //  Created by pronebird on 30/05/2022.
 //  Copyright © 2022 Mullvad VPN AB. All rights reserved.
diff --git a/ios/Operations/BackgroundObserver.swift b/ios/Operations/BackgroundObserver.swift
index 0439fdb303..db27a04eda 100644
--- a/ios/Operations/BackgroundObserver.swift
+++ b/ios/Operations/BackgroundObserver.swift
@@ -1,6 +1,6 @@
 //
 //  BackgroundObserver.swift
-//  MullvadVPN
+//  Operations
 //
 //  Created by pronebird on 31/05/2022.
 //  Copyright © 2022 Mullvad VPN AB. All rights reserved.
diff --git a/ios/Operations/GroupOperation.swift b/ios/Operations/GroupOperation.swift
index 0d83d732fe..1f474e7b28 100644
--- a/ios/Operations/GroupOperation.swift
+++ b/ios/Operations/GroupOperation.swift
@@ -1,6 +1,6 @@
 //
 //  GroupOperation.swift
-//  MullvadVPN
+//  Operations
 //
 //  Created by pronebird on 31/05/2022.
 //  Copyright © 2022 Mullvad VPN AB. All rights reserved.
diff --git a/ios/Operations/InputInjectionBuilder.swift b/ios/Operations/InputInjectionBuilder.swift
index ad2f329024..a4c63a6a00 100644
--- a/ios/Operations/InputInjectionBuilder.swift
+++ b/ios/Operations/InputInjectionBuilder.swift
@@ -1,6 +1,6 @@
 //
 //  InputInjectionBuilder.swift
-//  MullvadVPN
+//  Operations
 //
 //  Created by pronebird on 09/06/2022.
 //  Copyright © 2022 Mullvad VPN AB. All rights reserved.
@@ -84,11 +84,11 @@ public final class InputInjectionBuilder<OperationType, Context>
     }
 }
 
-public extension InputInjectionBuilder
+extension InputInjectionBuilder
     where Context: OperationInputContext,
     Context.Input == OperationType.Input
 {
-    func reduce() {
+    public func reduce() {
         reduce { context in
             return context.reduce()
         }
diff --git a/ios/Operations/InputOperation.swift b/ios/Operations/InputOperation.swift
index 9d88861f4d..9c141671ec 100644
--- a/ios/Operations/InputOperation.swift
+++ b/ios/Operations/InputOperation.swift
@@ -1,6 +1,6 @@
 //
 //  InputOperation.swift
-//  MullvadVPN
+//  Operations
 //
 //  Created by pronebird on 09/06/2022.
 //  Copyright © 2022 Mullvad VPN AB. All rights reserved.
@@ -22,12 +22,12 @@ public protocol InputOperation: Operation {
         where T: OutputOperation
 }
 
-public extension InputOperation {
-    func inject<T>(from dependency: T) where T: OutputOperation, T.Output == Input {
+extension InputOperation {
+    public func inject<T>(from dependency: T) where T: OutputOperation, T.Output == Input {
         inject(from: dependency, via: { $0 })
     }
 
-    func inject<T>(from dependency: T, via block: @escaping (T.Output) -> Input)
+    public func inject<T>(from dependency: T, via block: @escaping (T.Output) -> Input)
         where T: OutputOperation
     {
         setInputBlock {
@@ -38,7 +38,7 @@ public extension InputOperation {
         addDependency(dependency)
     }
 
-    func injectMany<Context>(context: Context) -> InputInjectionBuilder<Self, Context> {
+    public func injectMany<Context>(context: Context) -> InputInjectionBuilder<Self, Context> {
         return InputInjectionBuilder(
             operation: self,
             context: context
diff --git a/ios/Operations/OperationCompletion.swift b/ios/Operations/OperationCompletion.swift
index ffb8f54ce8..0e004bfe50 100644
--- a/ios/Operations/OperationCompletion.swift
+++ b/ios/Operations/OperationCompletion.swift
@@ -1,6 +1,6 @@
 //
 //  OperationCompletion.swift
-//  MullvadVPN
+//  Operations
 //
 //  Created by pronebird on 24/01/2022.
 //  Copyright © 2022 Mullvad VPN AB. All rights reserved.
diff --git a/ios/Operations/OperationCondition.swift b/ios/Operations/OperationCondition.swift
index 7a30744c2d..1019078ea9 100644
--- a/ios/Operations/OperationCondition.swift
+++ b/ios/Operations/OperationCondition.swift
@@ -1,6 +1,6 @@
 //
 //  OperationCondition.swift
-//  MullvadVPN
+//  Operations
 //
 //  Created by pronebird on 30/05/2022.
 //  Copyright © 2022 Mullvad VPN AB. All rights reserved.
diff --git a/ios/Operations/OperationObserver.swift b/ios/Operations/OperationObserver.swift
index db6264d2ba..3e7d790b24 100644
--- a/ios/Operations/OperationObserver.swift
+++ b/ios/Operations/OperationObserver.swift
@@ -1,6 +1,6 @@
 //
 //  OperationObserver.swift
-//  MullvadVPN
+//  Operations
 //
 //  Created by pronebird on 30/05/2022.
 //  Copyright © 2022 Mullvad VPN AB. All rights reserved.
diff --git a/ios/Operations/OutputOperation.swift b/ios/Operations/OutputOperation.swift
index 0e2e44525f..82274b1450 100644
--- a/ios/Operations/OutputOperation.swift
+++ b/ios/Operations/OutputOperation.swift
@@ -1,6 +1,6 @@
 //
 //  OutputOperation.swift
-//  MullvadVPN
+//  Operations
 //
 //  Created by pronebird on 31/05/2022.
 //  Copyright © 2022 Mullvad VPN AB. All rights reserved.
diff --git a/ios/Operations/ResultBlockOperation.swift b/ios/Operations/ResultBlockOperation.swift
index 483731360a..9329a566e1 100644
--- a/ios/Operations/ResultBlockOperation.swift
+++ b/ios/Operations/ResultBlockOperation.swift
@@ -1,6 +1,6 @@
 //
 //  ResultBlockOperation.swift
-//  MullvadVPN
+//  Operations
 //
 //  Created by pronebird on 12/05/2022.
 //  Copyright © 2022 Mullvad VPN AB. All rights reserved.
diff --git a/ios/Operations/ResultOperation+Output.swift b/ios/Operations/ResultOperation+Output.swift
index 56b13a0524..ba31220a46 100644
--- a/ios/Operations/ResultOperation+Output.swift
+++ b/ios/Operations/ResultOperation+Output.swift
@@ -1,6 +1,6 @@
 //
 //  ResultOperation+Output.swift
-//  MullvadVPN
+//  Operations
 //
 //  Created by pronebird on 31/05/2022.
 //  Copyright © 2022 Mullvad VPN AB. All rights reserved.
diff --git a/ios/Operations/ResultOperation.swift b/ios/Operations/ResultOperation.swift
index 4f88ce769b..9be0f1c0f4 100644
--- a/ios/Operations/ResultOperation.swift
+++ b/ios/Operations/ResultOperation.swift
@@ -1,6 +1,6 @@
 //
 //  ResultOperation.swift
-//  MullvadVPN
+//  Operations
 //
 //  Created by pronebird on 23/03/2022.
 //  Copyright © 2022 Mullvad VPN AB. All rights reserved.
diff --git a/ios/Operations/TransformOperation.swift b/ios/Operations/TransformOperation.swift
index 71cac93f4b..58048d1033 100644
--- a/ios/Operations/TransformOperation.swift
+++ b/ios/Operations/TransformOperation.swift
@@ -1,8 +1,9 @@
 //
 //  TransformOperation.swift
-//  AsyncOperationQueueTest
+//  Operations
 //
 //  Created by pronebird on 31/05/2022.
+//  Copyright © 2022 Mullvad VPN AB. All rights reserved.
 //
 
 import Foundation