Skip to content

Commit b35000f

Browse files
vpriscanvpriscan
committed
specify function return types explicitly; break long functions into multiple lines; use official code style; remove unnecessary non-null assertions
1 parent 9c28937 commit b35000f

File tree

12 files changed

+579
-363
lines changed

12 files changed

+579
-363
lines changed

‎gradle.properties‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
version=2.4.0-RC3
2-
org.gradle.jvmargs=-Xms256m -Xmx1024m -XX:MaxPermSize=256m
2+
org.gradle.jvmargs=-Xms256m -Xmx1024m -XX:MaxPermSize=256m
3+
kotlin.code.style=official

‎src/main/kotlin/io/reactivex/rxkotlin/Flowables.kt‎

Lines changed: 194 additions & 114 deletions
Large diffs are not rendered by default.

‎src/main/kotlin/io/reactivex/rxkotlin/Maybes.kt‎

Lines changed: 73 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -11,95 +11,122 @@ import io.reactivex.functions.*
1111
object Maybes {
1212
@CheckReturnValue
1313
@SchedulerSupport(SchedulerSupport.NONE)
14-
inline fun <T : Any, U : Any, R : Any> zip(s1: MaybeSource<T>, s2: MaybeSource<U>, crossinline zipper: (T, U) -> R): Maybe<R>
15-
= Maybe.zip(s1, s2, BiFunction { t, u -> zipper.invoke(t, u) })
14+
inline fun <T : Any, U : Any, R : Any> zip(
15+
s1: MaybeSource<T>,
16+
s2: MaybeSource<U>,
17+
crossinline zipper: (T, U) -> R
18+
): Maybe<R> = Maybe.zip(s1, s2,
19+
BiFunction { t, u -> zipper.invoke(t, u) })
1620

1721
@CheckReturnValue
1822
@SchedulerSupport(SchedulerSupport.NONE)
19-
fun <T : Any, U : Any> zip(s1: MaybeSource<T>, s2: MaybeSource<U>): Maybe<Pair<T,U>>
20-
= Maybe.zip(s1, s2, BiFunction { t, u -> Pair(t,u) })
23+
fun <T : Any, U : Any> zip(
24+
s1: MaybeSource<T>,
25+
s2: MaybeSource<U>
26+
): Maybe<Pair<T, U>> = Maybe.zip(s1, s2,
27+
BiFunction { t, u -> Pair(t, u) })
2128

2229

2330
@CheckReturnValue
2431
@SchedulerSupport(SchedulerSupport.NONE)
2532
inline fun <T1 : Any, T2 : Any, T3 : Any, R : Any>
26-
zip(s1: MaybeSource<T1>, s2: MaybeSource<T2>, s3: MaybeSource<T3>,
27-
crossinline zipper: (T1, T2, T3) -> R): Maybe<R>
28-
= Maybe.zip(s1, s2, s3, Function3 { t1, t2, t3 -> zipper.invoke(t1, t2, t3) })
33+
zip(
34+
s1: MaybeSource<T1>, s2: MaybeSource<T2>, s3: MaybeSource<T3>,
35+
crossinline zipper: (T1, T2, T3) -> R
36+
): Maybe<R> = Maybe.zip(s1, s2, s3,
37+
Function3 { t1, t2, t3 -> zipper.invoke(t1, t2, t3) })
2938

3039
@CheckReturnValue
3140
@SchedulerSupport(SchedulerSupport.NONE)
3241
fun <T1 : Any, T2 : Any, T3 : Any>
33-
zip(s1: MaybeSource<T1>, s2: MaybeSource<T2>, s3: MaybeSource<T3>): Maybe<Triple<T1,T2,T3>>
34-
= Maybe.zip(s1, s2, s3, Function3 { t1, t2, t3 -> Triple(t1,t2,t3) })
42+
zip(
43+
s1: MaybeSource<T1>,
44+
s2: MaybeSource<T2>,
45+
s3: MaybeSource<T3>
46+
): Maybe<Triple<T1, T2, T3>> = Maybe.zip(s1, s2, s3,
47+
Function3 { t1, t2, t3 -> Triple(t1, t2, t3) })
3548

3649
@CheckReturnValue
3750
@SchedulerSupport(SchedulerSupport.NONE)
3851
inline fun <T1 : Any, T2 : Any, T3 : Any, T4 : Any, R : Any>
39-
zip(s1: MaybeSource<T1>, s2: MaybeSource<T2>,
40-
s3: MaybeSource<T3>, s4: MaybeSource<T4>,
41-
crossinline zipper: (T1, T2, T3, T4) -> R): Maybe<R>
42-
= Maybe.zip(s1, s2, s3, s4, Function4 { t1, t2, t3, t4 -> zipper.invoke(t1, t2, t3, t4) })
52+
zip(
53+
s1: MaybeSource<T1>, s2: MaybeSource<T2>,
54+
s3: MaybeSource<T3>, s4: MaybeSource<T4>,
55+
crossinline zipper: (T1, T2, T3, T4) -> R
56+
): Maybe<R> = Maybe.zip(s1, s2, s3, s4,
57+
Function4 { t1, t2, t3, t4 -> zipper.invoke(t1, t2, t3, t4) })
4358

4459
@CheckReturnValue
4560
@SchedulerSupport(SchedulerSupport.NONE)
4661
inline fun <T1 : Any, T2 : Any, T3 : Any, T4 : Any, T5 : Any, R : Any>
47-
zip(s1: MaybeSource<T1>, s2: MaybeSource<T2>,
48-
s3: MaybeSource<T3>, s4: MaybeSource<T4>,
49-
s5: MaybeSource<T5>,
50-
crossinline zipper: (T1, T2, T3, T4, T5) -> R): Maybe<R>
51-
= Maybe.zip(s1, s2, s3, s4, s5, Function5 { t1, t2, t3, t4, t5 -> zipper.invoke(t1, t2, t3, t4, t5) })
62+
zip(
63+
s1: MaybeSource<T1>, s2: MaybeSource<T2>,
64+
s3: MaybeSource<T3>, s4: MaybeSource<T4>,
65+
s5: MaybeSource<T5>,
66+
crossinline zipper: (T1, T2, T3, T4, T5) -> R
67+
): Maybe<R> = Maybe.zip(s1, s2, s3, s4, s5,
68+
Function5 { t1, t2, t3, t4, t5 -> zipper.invoke(t1, t2, t3, t4, t5) })
5269

5370
@CheckReturnValue
5471
@SchedulerSupport(SchedulerSupport.NONE)
5572
inline fun <T1 : Any, T2 : Any, T3 : Any, T4 : Any, T5 : Any, T6 : Any, R : Any>
56-
zip(s1: MaybeSource<T1>, s2: MaybeSource<T2>,
57-
s3: MaybeSource<T3>, s4: MaybeSource<T4>,
58-
s5: MaybeSource<T5>, s6: MaybeSource<T6>,
59-
crossinline zipper: (T1, T2, T3, T4, T5, T6) -> R): Maybe<R>
60-
= Maybe.zip(s1, s2, s3, s4, s5, s6, Function6 { t1, t2, t3, t4, t5, t6 -> zipper.invoke(t1, t2, t3, t4, t5, t6) })
73+
zip(
74+
s1: MaybeSource<T1>, s2: MaybeSource<T2>,
75+
s3: MaybeSource<T3>, s4: MaybeSource<T4>,
76+
s5: MaybeSource<T5>, s6: MaybeSource<T6>,
77+
crossinline zipper: (T1, T2, T3, T4, T5, T6) -> R
78+
): Maybe<R> = Maybe.zip(s1, s2, s3, s4, s5, s6,
79+
Function6 { t1, t2, t3, t4, t5, t6 -> zipper.invoke(t1, t2, t3, t4, t5, t6) })
6180

6281
@CheckReturnValue
6382
@SchedulerSupport(SchedulerSupport.NONE)
6483
inline fun <T1 : Any, T2 : Any, T3 : Any, T4 : Any, T5 : Any, T6 : Any, T7 : Any, R : Any>
65-
zip(s1: MaybeSource<T1>, s2: MaybeSource<T2>,
66-
s3: MaybeSource<T3>, s4: MaybeSource<T4>,
67-
s5: MaybeSource<T5>, s6: MaybeSource<T6>,
68-
s7: MaybeSource<T7>,
69-
crossinline zipper: (T1, T2, T3, T4, T5, T6, T7) -> R): Maybe<R>
70-
= Maybe.zip(s1, s2, s3, s4, s5, s6, s7, Function7 { t1, t2, t3, t4, t5, t6, t7 -> zipper.invoke(t1, t2, t3, t4, t5, t6, t7) })
84+
zip(
85+
s1: MaybeSource<T1>, s2: MaybeSource<T2>,
86+
s3: MaybeSource<T3>, s4: MaybeSource<T4>,
87+
s5: MaybeSource<T5>, s6: MaybeSource<T6>,
88+
s7: MaybeSource<T7>,
89+
crossinline zipper: (T1, T2, T3, T4, T5, T6, T7) -> R
90+
): Maybe<R> = Maybe.zip(s1, s2, s3, s4, s5, s6, s7,
91+
Function7 { t1, t2, t3, t4, t5, t6, t7 -> zipper.invoke(t1, t2, t3, t4, t5, t6, t7) })
7192

7293
@CheckReturnValue
7394
@SchedulerSupport(SchedulerSupport.NONE)
7495
inline fun <T1 : Any, T2 : Any, T3 : Any, T4 : Any, T5 : Any, T6 : Any, T7 : Any, T8 : Any, R : Any>
75-
zip(s1: MaybeSource<T1>, s2: MaybeSource<T2>,
76-
s3: MaybeSource<T3>, s4: MaybeSource<T4>,
77-
s5: MaybeSource<T5>, s6: MaybeSource<T6>,
78-
s7: MaybeSource<T7>, s8: MaybeSource<T8>,
79-
crossinline zipper: (T1, T2, T3, T4, T5, T6, T7, T8) -> R): Maybe<R>
80-
= Maybe.zip(s1, s2, s3, s4, s5, s6, s7, s8, Function8 { t1, t2, t3, t4, t5, t6, t7, t8 -> zipper.invoke(t1, t2, t3, t4, t5, t6, t7, t8) })
96+
zip(
97+
s1: MaybeSource<T1>, s2: MaybeSource<T2>,
98+
s3: MaybeSource<T3>, s4: MaybeSource<T4>,
99+
s5: MaybeSource<T5>, s6: MaybeSource<T6>,
100+
s7: MaybeSource<T7>, s8: MaybeSource<T8>,
101+
crossinline zipper: (T1, T2, T3, T4, T5, T6, T7, T8) -> R
102+
): Maybe<R> = Maybe.zip(s1, s2, s3, s4, s5, s6, s7, s8,
103+
Function8 { t1, t2, t3, t4, t5, t6, t7, t8 -> zipper.invoke(t1, t2, t3, t4, t5, t6, t7, t8) })
81104

82105
@CheckReturnValue
83106
@SchedulerSupport(SchedulerSupport.NONE)
84107
inline fun <T1 : Any, T2 : Any, T3 : Any, T4 : Any, T5 : Any, T6 : Any, T7 : Any, T8 : Any, T9 : Any, R : Any>
85-
zip(s1: MaybeSource<T1>, s2: MaybeSource<T2>,
86-
s3: MaybeSource<T3>, s4: MaybeSource<T4>,
87-
s5: MaybeSource<T5>, s6: MaybeSource<T6>,
88-
s7: MaybeSource<T7>, s8: MaybeSource<T8>,
89-
s9: MaybeSource<T9>,
90-
crossinline zipper: (T1, T2, T3, T4, T5, T6, T7, T8, T9) -> R): Maybe<R>
91-
= Maybe.zip(s1, s2, s3, s4, s5, s6, s7, s8, s9, Function9 { t1, t2, t3, t4, t5, t6, t7, t8, t9 -> zipper.invoke(t1, t2, t3, t4, t5, t6, t7, t8, t9) })
108+
zip(
109+
s1: MaybeSource<T1>, s2: MaybeSource<T2>,
110+
s3: MaybeSource<T3>, s4: MaybeSource<T4>,
111+
s5: MaybeSource<T5>, s6: MaybeSource<T6>,
112+
s7: MaybeSource<T7>, s8: MaybeSource<T8>,
113+
s9: MaybeSource<T9>,
114+
crossinline zipper: (T1, T2, T3, T4, T5, T6, T7, T8, T9) -> R
115+
): Maybe<R> = Maybe.zip(s1, s2, s3, s4, s5, s6, s7, s8, s9,
116+
Function9 { t1, t2, t3, t4, t5, t6, t7, t8, t9 -> zipper.invoke(t1, t2, t3, t4, t5, t6, t7, t8, t9) })
92117
}
93118

94119
/**
95120
* An alias to [Maybe.zipWith], but allowing for cleaner lambda syntax.
96121
*/
97122
@CheckReturnValue
98123
@SchedulerSupport(SchedulerSupport.NONE)
99-
inline fun <T : Any, U : Any, R : Any> Maybe<T>.zipWith(other: MaybeSource<U>, crossinline zipper: (T, U) -> R): Maybe<R>
100-
= zipWith(other, BiFunction { t, u -> zipper.invoke(t, u) })
124+
inline fun <T : Any, U : Any, R : Any> Maybe<T>.zipWith(
125+
other: MaybeSource<U>,
126+
crossinline zipper: (T, U) -> R
127+
): Maybe<R> = zipWith(other, BiFunction { t, u -> zipper.invoke(t, u) })
101128

102129
@CheckReturnValue
103130
@SchedulerSupport(SchedulerSupport.NONE)
104-
fun <T : Any, U : Any> Maybe<T>.zipWith(other: MaybeSource<U>): Maybe<Pair<T, U>>
105-
= zipWith(other, BiFunction { t, u -> Pair(t,u) })
131+
fun <T : Any, U : Any> Maybe<T>.zipWith(other: MaybeSource<U>): Maybe<Pair<T, U>> =
132+
zipWith(other, BiFunction { t, u -> Pair(t, u) })

0 commit comments

Comments
 (0)