ReactiveX/RxSwift
1
1
Fork 0
mirror of https://github.com/ReactiveX/RxSwift.git synced 2024-10-04 22:17:41 +03:00
Code Issues Projects Releases Wiki Activity

catchAndReturn

Browse Source
This commit is contained in:
freak4pc 2020-10-03 23:15:23 +03:00 committed by Shai Mishali
parent 432740f0cc
commit c8f066c24d
15 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RxCocoa/Traits/Driver/ObservableConvertibleType+Driver.swift
View File

@ -19,7 +19,7 @@ extension ObservableConvertibleType {
let source = self
.asObservable()
.observe(on:DriverSharingStrategy.scheduler)
.catchJustReturn(onErrorJustReturn)
.catchAndReturn(onErrorJustReturn)
return Driver(source)
}

2
RxCocoa/Traits/SharedSequence/ObservableConvertibleType+SharedSequence.swift
View File

@ -19,7 +19,7 @@ extension ObservableConvertibleType {
let source = self
.asObservable()
.observe(on:S.scheduler)
.catchJustReturn(onErrorJustReturn)
.catchAndReturn(onErrorJustReturn)
return SharedSequence(source)
}

2
RxCocoa/Traits/Signal/ObservableConvertibleType+Signal.swift
View File

@ -19,7 +19,7 @@ extension ObservableConvertibleType {
let source = self
.asObservable()
.observe(on: SignalSharingStrategy.scheduler)
.catchJustReturn(onErrorJustReturn)
.catchAndReturn(onErrorJustReturn)
return Signal(source)
}

2
RxExample/RxExample/Examples/GitHubSignup/DefaultImplementations.swift
View File

@ -95,7 +95,7 @@ class GitHubDefaultAPI : GitHubAPI {
.map { pair in
return pair.response.statusCode == 404
}
.catchJustReturn(false)
.catchAndReturn(false)
}
func signup(_ username: String, password: String) -> Observable<Bool> {

2
RxExample/RxExample/Examples/GitHubSignup/UsingDriver/GithubSignupViewModel2.swift
View File

@ -67,7 +67,7 @@ class GithubSignupViewModel2 {
driver automagically adds "shareReplay(1)" under the hood.
.observe(on:MainScheduler.instance)
.catchJustReturn(.Failed(message: "Error contacting server"))
.catchAndReturn(.Failed(message: "Error contacting server"))
... are squashed into single `.asDriver(onErrorJustReturn: .Failed(message: "Error contacting server"))`
*/

4
RxExample/RxExample/Examples/GitHubSignup/UsingVanillaObservables/GithubSignupViewModel1.swift
View File

@ -66,7 +66,7 @@ class GithubSignupViewModel1 {
.flatMapLatest { username in
return validationService.validateUsername(username)
.observe(on:MainScheduler.instance)
.catchJustReturn(.failed(message: "Error contacting server"))
.catchAndReturn(.failed(message: "Error contacting server"))
}
.share(replay: 1)
@ -88,7 +88,7 @@ class GithubSignupViewModel1 {
.flatMapLatest { pair in
return API.signup(pair.username, password: pair.password)
.observe(on:MainScheduler.instance)
.catchJustReturn(false)
.catchAndReturn(false)
.trackActivity(signingIn)
}
.flatMapLatest { loggedIn -> Observable<Bool> in

2
RxExample/RxExample/Examples/TableViewWithEditingCommands/DetailViewController.swift
View File

@ -31,7 +31,7 @@ class DetailViewController: ViewController {
UIImage(data: data)
}
.observe(on:`$`.mainScheduler)
.catchJustReturn(nil)
.catchAndReturn(nil)
.subscribe(imageView.rx.image)
.disposed(by: disposeBag)

2
RxExample/RxExample/Examples/TableViewWithEditingCommands/TableViewWithEditingCommandsViewController.swift
View File

@ -78,7 +78,7 @@ class TableViewWithEditingCommandsViewController: ViewController, UITableViewDel
let loadFavoriteUsers = RandomUserAPI.sharedAPI
.getExampleUserResultSet()
.map(TableViewEditingCommand.setUsers)
.catchJustReturn(TableViewEditingCommand.setUsers(users: []))
.catchAndReturn(TableViewEditingCommand.setUsers(users: []))
let initialLoadCommand = Observable.just(TableViewEditingCommand.setFavoriteUsers(favoriteUsers: [superMan, watMan]))
.concat(loadFavoriteUsers)

6
RxSwift/Observables/Catch.swift
View File

@ -43,7 +43,7 @@ extension ObservableType {
- parameter element: Last element in an observable sequence in case error occurs.
- returns: An observable sequence containing the source sequence's elements, followed by the `element` in case an error occurred.
*/
public func catchJustReturn(_ element: Element)
public func catchAndReturn(_ element: Element)
-> Observable<Element> {
Catch(source: self.asObservable(), handler: { _ in Observable.just(element) })
}
@ -56,10 +56,10 @@ extension ObservableType {
- parameter element: Last element in an observable sequence in case error occurs.
- returns: An observable sequence containing the source sequence's elements, followed by the `element` in case an error occurred.
*/
@available(*, deprecated, renamed: "catchJustReturn(_:)")
@available(*, deprecated, renamed: "catchAndReturn(_:)")
public func catchErrorJustReturn(_ element: Element)
-> Observable<Element> {
catchJustReturn(element)
catchAndReturn(element)
}
}

2
RxSwift/Traits/Infallible/ObservableConvertibleType+Infallible.swift
View File

@ -8,7 +8,7 @@
extension ObservableConvertibleType {
func asInfallible(onErrorJustReturn element: Element) -> Infallible<Element> {
Infallible(self.asObservable().catchJustReturn(element))
Infallible(self.asObservable().catchAndReturn(element))
}
func asInfallible(onErrorFallbackTo infallible: Infallible<Element>) -> Infallible<Element> {

8
RxSwift/Traits/PrimitiveSequence/Maybe.swift
View File

@ -324,9 +324,9 @@ extension PrimitiveSequenceType where Trait == MaybeTrait {
- parameter element: Last element in an observable sequence in case error occurs.
- returns: An observable sequence containing the source sequence's elements, followed by the `element` in case an error occurred.
*/
public func catchJustReturn(_ element: Element)
public func catchAndReturn(_ element: Element)
-> PrimitiveSequence<Trait, Element> {
PrimitiveSequence(raw: self.primitiveSequence.source.catchJustReturn(element))
PrimitiveSequence(raw: self.primitiveSequence.source.catchAndReturn(element))
}
/**
@ -337,9 +337,9 @@ extension PrimitiveSequenceType where Trait == MaybeTrait {
- parameter element: Last element in an observable sequence in case error occurs.
- returns: An observable sequence containing the source sequence's elements, followed by the `element` in case an error occurred.
*/
@available(*, deprecated, renamed: "catchJustReturn(_:)")
@available(*, deprecated, renamed: "catchAndReturn(_:)")
public func catchErrorJustReturn(_ element: Element)
-> PrimitiveSequence<Trait, Element> {
PrimitiveSequence(raw: self.primitiveSequence.source.catchJustReturn(element))
PrimitiveSequence(raw: self.primitiveSequence.source.catchAndReturn(element))
}
}

8
RxSwift/Traits/PrimitiveSequence/Single.swift
View File

@ -331,9 +331,9 @@ extension PrimitiveSequenceType where Trait == SingleTrait {
- parameter element: Last element in an observable sequence in case error occurs.
- returns: An observable sequence containing the source sequence's elements, followed by the `element` in case an error occurred.
*/
public func catchJustReturn(_ element: Element)
public func catchAndReturn(_ element: Element)
-> PrimitiveSequence<Trait, Element> {
PrimitiveSequence(raw: self.primitiveSequence.source.catchJustReturn(element))
PrimitiveSequence(raw: self.primitiveSequence.source.catchAndReturn(element))
}
/**
@ -344,10 +344,10 @@ extension PrimitiveSequenceType where Trait == SingleTrait {
- parameter element: Last element in an observable sequence in case error occurs.
- returns: An observable sequence containing the source sequence's elements, followed by the `element` in case an error occurred.
*/
@available(*, deprecated, renamed: "catchJustReturn(_:)")
@available(*, deprecated, renamed: "catchAndReturn(_:)")
public func catchErrorJustReturn(_ element: Element)
-> PrimitiveSequence<Trait, Element> {
catchJustReturn(element)
catchAndReturn(element)
}
/// Converts `self` to `Maybe` trait.

2
Tests/RxCocoaTests/ExampleTests.swift
View File

@ -33,7 +33,7 @@ extension ExampleTests {
return .just([])
}
return searchGitHub(query)
.catchJustReturn([])
.catchAndReturn([])
}
.observe(on:MainScheduler.instance)

4
Tests/RxSwiftTests/MaybeTest.swift
View File

@ -359,11 +359,11 @@ extension MaybeTest {
])
}
func test_catchJustReturn() {
func test_catchAndReturn() {
let scheduler = TestScheduler(initialClock: 0)
let res = scheduler.start {
Maybe.error(testError).catchJustReturn(2)
Maybe.error(testError).catchAndReturn(2)
}
XCTAssertEqual(res.events, [

4
Tests/RxSwiftTests/SingleTest.swift
View File

@ -296,11 +296,11 @@ extension SingleTest {
])
}
func test_catchJustReturn() {
func test_catchAndReturn() {
let scheduler = TestScheduler(initialClock: 0)
let res = scheduler.start {
Single.error(testError).catchJustReturn(2)
Single.error(testError).catchAndReturn(2)
}
XCTAssertEqual(res.events, [