Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sam Adapters for RxJava 2.x #114

Merged
merged 7 commits into from
May 2, 2017
Merged

Sam Adapters for RxJava 2.x #114

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
97ffa10
start implementing SAM fix operators
thomasnield Apr 19, 2017
c84fe2e
Add more zip() and combineLatest()
thomasnield Apr 20, 2017
c193863
add more zip() and combineLatest()
thomasnield Apr 20, 2017
29eae30
refactor ObservableKt to Observables, FlowableKt to Flowables, etc.
thomasnield Apr 21, 2017
c0906f9
rename combineFunction to combiner
thomasnield Apr 24, 2017
71c1a84
clean up lambda syntax on SAM helpers, update to Kotlin 1.1.2
thomasnield Apr 29, 2017
85f31eb
Merge remote-tracking branch 'origin/sam-adapters' into sam-adapters
thomasnield Apr 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
147 changes: 147 additions & 0 deletions src/main/kotlin/io/reactivex/rxkotlin/Flowables.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,147 @@
package io.reactivex.rxkotlin
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

code formatting in all file


import io.reactivex.Flowable
import io.reactivex.functions.BiFunction
import io.reactivex.functions.Function3
import io.reactivex.functions.Function4
import io.reactivex.functions.Function5
import org.reactivestreams.Publisher


object Flowables {

inline fun <T1,T2,R> combineLatest(source1: Flowable<T1>, source2: Flowable<T2>, crossinline combineFunction: (T1, T2) -> R) =
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: I know people aren't often going to be reading this file, but I feel combiner is a nicer name than combineFunction.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay Ill change that.

Flowable.combineLatest(source1, source2,
BiFunction<T1, T2, R> { t1, t2 -> combineFunction(t1,t2) })!!
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why !!?


inline fun <T1,T2,T3,R> combineLatest(source1: Flowable<T1>, source2: Flowable<T2>, source3: Flowable<T3>, crossinline combineFunction: (T1,T2, T3) -> R) =
Flowable.combineLatest(source1, source2,source3,
io.reactivex.functions.Function3<T1, T2, T3, R> { t1: T1, t2: T2, t3: T3 -> combineFunction(t1,t2, t3) })!!

inline fun <T1,T2,T3,T4,R> combineLatest(source1: Flowable<T1>, source2: Flowable<T2>, source3: Flowable<T3>,
source4: Flowable<T4>, crossinline combineFunction: (T1,T2, T3, T4) -> R) =
Flowable.combineLatest(source1, source2,source3, source4,
io.reactivex.functions.Function4<T1, T2, T3, T4, R> { t1: T1, t2: T2, t3: T3, t4: T4 -> combineFunction(t1,t2, t3, t4) })!!


inline fun <T1,T2,T3,T4,T5,R> combineLatest(source1: Flowable<T1>, source2: Flowable<T2>,
source3: Flowable<T3>, source4: Flowable<T4>,
source5: Flowable<T5>, crossinline combineFunction: (T1,T2, T3, T4, T5) -> R) =
Flowable.combineLatest(source1, source2,source3, source4, source5,
io.reactivex.functions.Function5<T1, T2, T3, T4, T5, R> { t1: T1, t2: T2, t3: T3, t4: T4, t5: T5 -> combineFunction(t1,t2, t3, t4, t5) })!!


inline fun <T1,T2,T3,T4,T5,T6,R> combineLatest(source1: Flowable<T1>, source2: Flowable<T2>,
source3: Flowable<T3>, source4: Flowable<T4>,
source5: Flowable<T5>, source6: Flowable<T6>, crossinline combineFunction: (T1,T2, T3, T4, T5, T6) -> R) =
Flowable.combineLatest(source1, source2,source3, source4, source5, source6,
io.reactivex.functions.Function6<T1, T2, T3, T4, T5, T6, R> { t1: T1, t2: T2, t3: T3, t4: T4, t5: T5, t6: T6 -> combineFunction(t1,t2, t3, t4, t5, t6) })!!

inline fun <T1,T2,T3,T4,T5,T6,T7,R> combineLatest(source1: Flowable<T1>, source2: Flowable<T2>,
source3: Flowable<T3>, source4: Flowable<T4>,
source5: Flowable<T5>, source6: Flowable<T6>,
source7: Flowable<T7>, crossinline combineFunction: (T1,T2, T3, T4, T5, T6, T7) -> R) =
Flowable.combineLatest(source1, source2,source3, source4, source5, source6, source7,
io.reactivex.functions.Function7<T1, T2, T3, T4, T5, T6, T7, R> { t1: T1, t2: T2, t3: T3, t4: T4, t5: T5, t6: T6, t7: T7 -> combineFunction(t1,t2, t3, t4, t5, t6, t7) })!!


inline fun <T1,T2,T3,T4,T5,T6,T7,T8,R> combineLatest(source1: Flowable<T1>, source2: Flowable<T2>,
source3: Flowable<T3>, source4: Flowable<T4>,
source5: Flowable<T5>, source6: Flowable<T6>,
source7: Flowable<T7>, source8: Flowable<T8>,
crossinline combineFunction: (T1,T2, T3, T4, T5, T6, T7, T8) -> R) =
Flowable.combineLatest(source1, source2,source3, source4, source5, source6, source7, source8,
io.reactivex.functions.Function8<T1, T2, T3, T4, T5, T6, T7, T8,R> { t1: T1, t2: T2, t3: T3, t4: T4, t5: T5, t6: T6, t7: T7, t8: T8 -> combineFunction(t1,t2, t3, t4, t5, t6, t7, t8) })!!

inline fun <T1,T2,T3,T4,T5,T6,T7,T8,T9,R> combineLatest(source1: Flowable<T1>, source2: Flowable<T2>,
source3: Flowable<T3>, source4: Flowable<T4>,
source5: Flowable<T5>, source6: Flowable<T6>,
source7: Flowable<T7>, source8: Flowable<T8>,
source9: Flowable<T9>, crossinline combineFunction: (T1,T2, T3, T4, T5, T6, T7, T8, T9) -> R) =
Flowable.combineLatest(source1, source2,source3, source4, source5, source6, source7, source8, source9,
io.reactivex.functions.Function9<T1, T2, T3, T4, T5, T6, T7, T8,T9,R> { t1: T1, t2: T2, t3: T3, t4: T4, t5: T5, t6: T6, t7: T7, t8: T8, t9: T9 -> combineFunction(t1,t2, t3, t4, t5, t6, t7, t8, t9) })!!




inline fun <T1,T2,R> zip(source1: Flowable<T1>, source2: Flowable<T2>, crossinline combineFunction: (T1, T2) -> R) =
Flowable.zip(source1, source2,
BiFunction<T1, T2, R> { t1, t2 -> combineFunction(t1,t2) })!!

inline fun <T1,T2,T3,R> zip(source1: Flowable<T1>, source2: Flowable<T2>, source3: Flowable<T3>, crossinline combineFunction: (T1,T2, T3) -> R) =
Flowable.zip(source1, source2,source3,
io.reactivex.functions.Function3<T1, T2, T3, R> { t1: T1, t2: T2, t3: T3 -> combineFunction(t1,t2, t3) })!!

inline fun <T1,T2,T3,T4,R> zip(source1: Flowable<T1>, source2: Flowable<T2>, source3: Flowable<T3>, source4: Flowable<T4>, crossinline combineFunction: (T1,T2, T3, T4) -> R) =
Flowable.zip(source1, source2,source3, source4,
io.reactivex.functions.Function4<T1, T2, T3, T4, R> { t1: T1, t2: T2, t3: T3, t4: T4 -> combineFunction(t1,t2, t3, t4) })!!

inline fun <T1,T2,T3,T4,T5,R> zip(source1: Flowable<T1>, source2: Flowable<T2>,
source3: Flowable<T3>, source4: Flowable<T4>,
source5: Flowable<T5>, crossinline combineFunction: (T1,T2, T3, T4, T5) -> R) =
Flowable.zip(source1, source2,source3, source4, source5,
io.reactivex.functions.Function5<T1, T2, T3, T4, T5, R> { t1: T1, t2: T2, t3: T3, t4: T4, t5: T5 -> combineFunction(t1,t2, t3, t4, t5) })!!



inline fun <T1,T2,T3,T4,T5,T6,R> zip(source1: Flowable<T1>, source2: Flowable<T2>,
source3: Flowable<T3>, source4: Flowable<T4>,
source5: Flowable<T5>, source6: Flowable<T6>, crossinline combineFunction: (T1,T2, T3, T4, T5, T6) -> R) =
Flowable.zip(source1, source2,source3, source4, source5, source6,
io.reactivex.functions.Function6<T1, T2, T3, T4, T5, T6, R> { t1: T1, t2: T2, t3: T3, t4: T4, t5: T5, t6: T6 -> combineFunction(t1,t2, t3, t4, t5, t6) })!!

inline fun <T1,T2,T3,T4,T5,T6,T7,R> zip(source1: Flowable<T1>, source2: Flowable<T2>,
source3: Flowable<T3>, source4: Flowable<T4>,
source5: Flowable<T5>, source6: Flowable<T6>,
source7: Flowable<T7>, crossinline combineFunction: (T1,T2, T3, T4, T5, T6, T7) -> R) =
Flowable.zip(source1, source2,source3, source4, source5, source6, source7,
io.reactivex.functions.Function7<T1, T2, T3, T4, T5, T6, T7, R> { t1: T1, t2: T2, t3: T3, t4: T4, t5: T5, t6: T6, t7: T7 -> combineFunction(t1,t2, t3, t4, t5, t6, t7) })!!


inline fun <T1,T2,T3,T4,T5,T6,T7,T8,R> zip(source1: Flowable<T1>, source2: Flowable<T2>,
source3: Flowable<T3>, source4: Flowable<T4>,
source5: Flowable<T5>, source6: Flowable<T6>,
source7: Flowable<T7>, source8: Flowable<T8>,
crossinline combineFunction: (T1,T2, T3, T4, T5, T6, T7, T8) -> R) =
Flowable.zip(source1, source2,source3, source4, source5, source6, source7, source8,
io.reactivex.functions.Function8<T1, T2, T3, T4, T5, T6, T7, T8,R> { t1: T1, t2: T2, t3: T3, t4: T4, t5: T5, t6: T6, t7: T7, t8: T8 -> combineFunction(t1,t2, t3, t4, t5, t6, t7, t8) })!!

inline fun <T1,T2,T3,T4,T5,T6,T7,T8,T9,R> zip(source1: Flowable<T1>, source2: Flowable<T2>,
source3: Flowable<T3>, source4: Flowable<T4>,
source5: Flowable<T5>, source6: Flowable<T6>,
source7: Flowable<T7>, source8: Flowable<T8>,
source9: Flowable<T9>, crossinline combineFunction: (T1,T2, T3, T4, T5, T6, T7, T8, T9) -> R) =
Flowable.zip(source1, source2,source3, source4, source5, source6, source7, source8, source9,
io.reactivex.functions.Function9<T1, T2, T3, T4, T5, T6, T7, T8,T9,R> { t1: T1, t2: T2, t3: T3, t4: T4, t5: T5, t6: T6, t7: T7, t8: T8, t9: T9 -> combineFunction(t1,t2, t3, t4, t5, t6, t7, t8, t9) })!!

}

/**
* An alias to [Flowable.withLatestFrom], but allowing for cleaner lambda syntax.
*/
inline fun <T, U, R> Flowable<T>.withLatestFrom(other: Publisher<U>, crossinline combiner: (T, U) -> R): Flowable<R>
= withLatestFrom(other, BiFunction<T, U, R> { t, u -> combiner.invoke(t, u) })

/**
* An alias to [Flowable.withLatestFrom], but allowing for cleaner lambda syntax.
*/
inline fun <T, T1, T2, R> Flowable<T>.withLatestFrom(o1: Publisher<T1>, o2: Publisher<T2>, crossinline combiner: (T, T1, T2) -> R): Flowable<R>
= withLatestFrom(o1, o2, Function3<T, T1, T2, R> { t, t1, t2 -> combiner.invoke(t, t1, t2) })

/**
* An alias to [Flowable.withLatestFrom], but allowing for cleaner lambda syntax.
*/
inline fun <T, T1, T2, T3, R> Flowable<T>.withLatestFrom(o1: Publisher<T1>, o2: Publisher<T2>, o3: Publisher<T3>, crossinline combiner: (T, T1, T2, T3) -> R): Flowable<R>
= withLatestFrom(o1, o2, o3, Function4<T, T1, T2, T3, R> { t, t1, t2, t3 -> combiner.invoke(t, t1, t2, t3) })

/**
* An alias to [Flowable.withLatestFrom], but allowing for cleaner lambda syntax.
*/
inline fun <T, T1, T2, T3, T4, R> Flowable<T>.withLatestFrom(o1: Publisher<T1>, o2: Publisher<T2>, o3: Publisher<T3>, o4: Publisher<T4>, crossinline combiner: (T, T1, T2, T3, T4) -> R): Flowable<R>
= withLatestFrom(o1, o2, o3, o4, Function5<T, T1, T2, T3, T4, R> { t, t1, t2, t3, t4 -> combiner.invoke(t, t1, t2, t3, t4) })

/**
* An alias to [Flowable.zipWith], but allowing for cleaner lambda syntax.
*/
inline fun <T, U, R> Flowable<T>.zipWith(other: Publisher<U>, crossinline zipper: (T, U) -> R): Flowable<R>
= zipWith(other, BiFunction { t, u -> zipper.invoke(t, u) })
16 changes: 16 additions & 0 deletions src/main/kotlin/io/reactivex/rxkotlin/Maybes.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package io.reactivex.rxkotlin

import io.reactivex.Maybe
import io.reactivex.MaybeSource
import io.reactivex.functions.BiFunction

object Maybes {
inline fun <T, U, R> zip(s1: MaybeSource<T>, s2: MaybeSource<U>, crossinline zipper: (T, U) -> R): MaybeSource<R>
= Maybe.zip(s1,s2, BiFunction { t, u -> zipper.invoke(t, u) })
}

/**
* An alias to [Maybe.zipWith], but allowing for cleaner lambda syntax.
*/
inline fun <T, U, R> Maybe<T>.zipWith(other: MaybeSource<U>, crossinline zipper: (T, U) -> R): Maybe<R>
= zipWith(other, BiFunction { t, u -> zipper.invoke(t, u) })