Rollback unnecessary renaming of Retrier to BaseRetrier

PittsCraft · Jul 26, 2023 · 6b6146d · 6b6146d
1 parent 9cb8f52
commit 6b6146d
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 22 deletions.
diff --git a/Sources/SwiftRetrier/Core/Model/Retriers/FallibleRetrier.swift b/Sources/SwiftRetrier/Core/Model/Retriers/FallibleRetrier.swift
@@ -1,4 +1,4 @@
 import Foundation
 import Combine
 
-public protocol FallibleRetrier: BaseRetrier where Failure == Error {}
+public protocol FallibleRetrier: Retrier where Failure == Error {}
diff --git a/Sources/SwiftRetrier/Core/Model/Retriers/InfallibleRetrier.swift b/Sources/SwiftRetrier/Core/Model/Retriers/InfallibleRetrier.swift
@@ -1,4 +1,4 @@
 import Foundation
 import Combine
 
-public protocol InfallibleRetrier: BaseRetrier where Failure == Never {}
+public protocol InfallibleRetrier: Retrier where Failure == Never {}
diff --git a/Sources/SwiftRetrier/Core/Model/Retriers/Repeater.swift b/Sources/SwiftRetrier/Core/Model/Retriers/Repeater.swift
@@ -1 +1 @@
-protocol Repeater: BaseRetrier {}
+protocol Repeater: Retrier {}
diff --git a/...ier/Core/Model/Retriers/BaseRetrier.swift → ...Retrier/Core/Model/Retriers/Retrier.swift b/...ier/Core/Model/Retriers/BaseRetrier.swift → ...Retrier/Core/Model/Retriers/Retrier.swift
@@ -1,14 +1,14 @@
 import Foundation
 import Combine
 
-public protocol BaseRetrier: Cancellable, AnyObject {
+public protocol Retrier: Cancellable, AnyObject {
     associatedtype Output
     associatedtype Failure: Error
 
     func publisher() -> AnyPublisher<Result<Output, Error>, Failure>
 }
 
-public extension BaseRetrier {
+public extension Retrier {
 
     func publisher(propagateCancellation: Bool) -> AnyPublisher<Result<Output, Error>, Failure> {
         if propagateCancellation {

diff --git a/Sources/SwiftRetrier/Core/Model/Retriers/SingleOutputRetrier.swift b/Sources/SwiftRetrier/Core/Model/Retriers/SingleOutputRetrier.swift
@@ -1,7 +1,7 @@
 import Foundation
 import Combine
 
-public protocol SingleOutputRetrier: BaseRetrier {
+public protocol SingleOutputRetrier: Retrier {
 
     var value: Output { get async throws }
 }

diff --git a/Sources/SwiftRetrier/DSL/BuilderEntryPoints.swift b/Sources/SwiftRetrier/DSL/BuilderEntryPoints.swift
@@ -4,20 +4,20 @@ public func withExponentialBackoff(
     timeSlot: TimeInterval = ExponentialBackoffConstants.defaultTimeSlot,
     maxDelay: TimeInterval = ExponentialBackoffConstants.defaultMaxDelay,
     jitter: ExponentialBackoffInfallibleRetryPolicy.Jitter = ExponentialBackoffConstants.defaultJitter
-) -> Retrier {
+) -> ColdInfallibleRetrier {
     let policy = ExponentialBackoffInfallibleRetryPolicy(timeSlot: timeSlot,
                                                          maxDelay: maxDelay,
                                                          jitter: jitter)
-    return Retrier(policy: policy, conditionPublisher: nil)
+    return ColdInfallibleRetrier(policy: policy, conditionPublisher: nil)
 }
 
 public func withConstantDelay(
     _ delay: TimeInterval = ConstantBackoffConstants.defaultDelay
-) -> Retrier {
+) -> ColdInfallibleRetrier {
     let policy = ConstantBackoffInfallibleRetryPolicy(delay: delay)
-    return Retrier(policy: policy, conditionPublisher: nil)
+    return ColdInfallibleRetrier(policy: policy, conditionPublisher: nil)
 }
 
-public func withNoDelay() -> Retrier {
+public func withNoDelay() -> ColdInfallibleRetrier {
     withConstantDelay(0)
 }
diff --git a/Sources/SwiftRetrier/DSL/Retrier.swift → ...ftRetrier/DSL/ColdInfallibleRetrier.swift b/Sources/SwiftRetrier/DSL/Retrier.swift → ...ftRetrier/DSL/ColdInfallibleRetrier.swift
@@ -1,12 +1,12 @@
 import Foundation
 import Combine
 
-public struct Retrier {
+public struct ColdInfallibleRetrier {
     let policy: InfallibleRetryPolicy
     let conditionPublisher: AnyPublisher<Bool, Never>?
 }
 
-public extension Retrier {
+public extension ColdInfallibleRetrier {
 
     func failingOn(
         maxAttempts: UInt = UInt.max,
@@ -18,9 +18,9 @@ public extension Retrier {
 
     func onlyWhen<P>(
         _ conditionPublisher: P
-    ) -> Retrier where P: Publisher, P.Output == Bool, P.Failure == Never {
-        Retrier(policy: policy,
-                conditionPublisher: conditionPublisher.eraseToAnyPublisher())
+    ) -> ColdInfallibleRetrier where P: Publisher, P.Output == Bool, P.Failure == Never {
+        ColdInfallibleRetrier(policy: policy,
+                              conditionPublisher: conditionPublisher.eraseToAnyPublisher())
     }
 
     func repeating(withDelay repeatDelay: TimeInterval) -> ColdInfallibleRepeater {

diff --git a/Sources/SwiftRetrier/TypeErasing/AnyRetrier.swift b/Sources/SwiftRetrier/TypeErasing/AnyRetrier.swift
@@ -1,17 +1,17 @@
 import Foundation
 import Combine
 
-public class AnyRetrier<Output, Failure: Error>: BaseRetrier {
+public class AnyRetrier<Output, Failure: Error>: Retrier {
 
     public let publisherBlock: () -> AnyPublisher<Result<Output, Error>, Failure>
     private let cancelBlock: () -> Void
 
-    public init<R>(_ retrier: R) where R: BaseRetrier, R.Output == Output, R.Failure == Failure {
+    public init<R>(_ retrier: R) where R: Retrier, R.Output == Output, R.Failure == Failure {
         self.publisherBlock = retrier.publisher
         self.cancelBlock = retrier.cancel
     }
 
-    public init<R>(_ retrier: R) where R: BaseRetrier, R.Output == Output, R.Failure == Never {
+    public init<R>(_ retrier: R) where R: Retrier, R.Output == Output, R.Failure == Never {
         self.publisherBlock = {
             retrier.publisher()
                 .setFailureType(to: Failure.self)
@@ -29,7 +29,7 @@ public class AnyRetrier<Output, Failure: Error>: BaseRetrier {
     }
 }
 
-extension BaseRetrier {
+extension Retrier {
     public func eraseToAnyRetrier() -> AnyRetrier<Output, Failure> {
         AnyRetrier<Output, Failure>(self)
     }

diff --git a/Tests/SwiftRetrierTests/Retriers/ProtocolBasedTests/ConditionalRetrierTests.swift b/Tests/SwiftRetrierTests/Retriers/ProtocolBasedTests/ConditionalRetrierTests.swift
@@ -2,7 +2,7 @@ import XCTest
 @testable import SwiftRetrier
 import Combine
 
-class ConditionalRetrierTests<R: BaseRetrier>: XCTestCase {
+class ConditionalRetrierTests<R: Retrier>: XCTestCase {
 
     var retrier: ((AnyPublisher<Bool, Never>, @escaping Job<Void>) -> R)!
 

diff --git a/Tests/SwiftRetrierTests/Retriers/ProtocolBasedTests/RetrierTests.swift b/Tests/SwiftRetrierTests/Retriers/ProtocolBasedTests/RetrierTests.swift
@@ -2,7 +2,7 @@ import Foundation
 import XCTest
 @testable import SwiftRetrier
 
-class RetrierTests<R: BaseRetrier>: XCTestCase {
+class RetrierTests<R: Retrier>: XCTestCase {
 
     var retrier: ((@escaping Job<Void>) -> R)!