Skip to content

Commit 3bf7c4d

Browse files
committed
Remove () and update CompletenessTest
1 parent 7fd0de8 commit 3bf7c4d

File tree

3 files changed

+6
-10
lines changed

3 files changed

+6
-10
lines changed

language-adaptors/rxjava-scala/src/examples/scala/rx/lang/scala/examples/RxScalaDemo.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -737,7 +737,7 @@ class RxScalaDemo extends JUnitSuite {
737737
}
738738

739739
@Test def repeatExample1(): Unit = {
740-
val o : Observable[String] = List("alice", "bob", "carol").toObservable.repeat().take(6)
740+
val o : Observable[String] = List("alice", "bob", "carol").toObservable.repeat.take(6)
741741
assertEquals(List("alice", "bob", "carol", "alice", "bob", "carol"), o.toBlockingObservable.toList)
742742
}
743743

language-adaptors/rxjava-scala/src/main/scala/rx/lang/scala/Observable.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1431,7 +1431,7 @@ trait Observable[+T]
14311431
*
14321432
* @return an [[rx.lang.scala.observables.ConnectableObservable]].
14331433
*/
1434-
def publish(): ConnectableObservable[T] = {
1434+
def publish: ConnectableObservable[T] = {
14351435
new ConnectableObservable[T](asJavaObservable.publish())
14361436
}
14371437

@@ -2649,7 +2649,7 @@ trait Observable[+T]
26492649
* emits [1, 2, 3, 4, 5] then the complete output would be [1, 2, 1, 2, 3, 4, 5, onCompleted].
26502650
* @return Observable with retry logic.
26512651
*/
2652-
def retry(): Observable[T] = {
2652+
def retry: Observable[T] = {
26532653
toScalaObservable[T](asJavaObservable.retry())
26542654
}
26552655

@@ -2662,7 +2662,7 @@ trait Observable[+T]
26622662
* @see <a href="https://github.com/Netflix/RxJava/wiki/Creating-Observables#wiki-repeat">RxJava Wiki: repeat()</a>
26632663
* @see <a href="http://msdn.microsoft.com/en-us/library/hh229428.aspx">MSDN: Observable.Repeat</a>
26642664
*/
2665-
def repeat(): Observable[T] = {
2665+
def repeat: Observable[T] = {
26662666
toScalaObservable[T](asJavaObservable.repeat())
26672667
}
26682668

language-adaptors/rxjava-scala/src/test/scala/rx/lang/scala/CompletenessTest.scala

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,14 @@ class CompletenessTest extends JUnitSuite {
8383
"lift(Operator[_ <: R, _ >: T])" -> "lift(Subscriber[R] => Subscriber[T])",
8484
"mapMany(Func1[_ >: T, _ <: Observable[_ <: R]])" -> "flatMap(T => Observable[R])",
8585
"mapWithIndex(Func2[_ >: T, Integer, _ <: R])" -> "[combine `zipWithIndex` with `map` or with a for comprehension]",
86+
"multicast(Subject[_ >: T, _ <: R])" -> "multicast(Subject[R])",
87+
"multicast(Func0[_ <: Subject[_ >: T, _ <: TIntermediate]], Func1[_ >: Observable[TIntermediate], _ <: Observable[TResult]])" -> "multicast(() => Subject[R], Observable[R] => Observable[U])",
8688
"onErrorResumeNext(Func1[Throwable, _ <: Observable[_ <: T]])" -> "onErrorResumeNext(Throwable => Observable[U])",
8789
"onErrorResumeNext(Observable[_ <: T])" -> "onErrorResumeNext(Observable[U])",
8890
"onErrorReturn(Func1[Throwable, _ <: T])" -> "onErrorReturn(Throwable => U)",
8991
"onExceptionResumeNext(Observable[_ <: T])" -> "onExceptionResumeNext(Observable[U])",
9092
"parallel(Func1[Observable[T], Observable[R]])" -> "parallel(Observable[T] => Observable[R])",
9193
"parallel(Func1[Observable[T], Observable[R]], Scheduler)" -> "parallel(Observable[T] => Observable[R], Scheduler)",
92-
"publish()" -> "publish()",
9394
"publish(T)" -> "publish(U)",
9495
"publish(Func1[_ >: Observable[T], _ <: Observable[R]])" -> "publish(Observable[U] => Observable[R])",
9596
"publish(Func1[_ >: Observable[T], _ <: Observable[R]], T)" -> "publish(Observable[U] => Observable[R], U)",
@@ -103,7 +104,6 @@ class CompletenessTest extends JUnitSuite {
103104
"replay(Func1[_ >: Observable[T], _ <: Observable[R]], Long, TimeUnit)" -> "replay(Observable[U] => Observable[R], Duration)",
104105
"replay(Func1[_ >: Observable[T], _ <: Observable[R]], Long, TimeUnit, Scheduler)" -> "replay(Observable[U] => Observable[R], Duration, Scheduler)",
105106
"replay(Func1[_ >: Observable[T], _ <: Observable[R]], Scheduler)" -> "replay(Observable[U] => Observable[R], Scheduler)",
106-
"retry()" -> "retry()",
107107
"scan(Func2[T, T, T])" -> unnecessary,
108108
"scan(R, Func2[R, _ >: T, R])" -> "scan(R)((R, T) => R)",
109109
"skip(Int)" -> "drop(Int)",
@@ -158,11 +158,7 @@ class CompletenessTest extends JUnitSuite {
158158
"merge(Observable[_ <: Observable[_ <: T]])" -> "flatten(<:<[Observable[T], Observable[Observable[U]]])",
159159
"mergeDelayError(Observable[_ <: T], Observable[_ <: T])" -> "mergeDelayError(Observable[U])",
160160
"mergeDelayError(Observable[_ <: Observable[_ <: T]])" -> "flattenDelayError(<:<[Observable[T], Observable[Observable[U]]])",
161-
"multicast(Subject[_ >: T, _ <: R])" -> "multicast(Subject[R])",
162-
"multicast(Func0[_ <: Subject[_ >: T, _ <: TIntermediate]], Func1[_ >: Observable[TIntermediate], _ <: Observable[TResult]])" -> "multicast(() => Subject[R], Observable[R] => Observable[U])",
163161
"range(Int, Int)" -> "apply(Range)",
164-
"repeat()" -> "repeat()",
165-
"retry()" -> "retry()",
166162
"sequenceEqual(Observable[_ <: T], Observable[_ <: T])" -> "[use `(first zip second) map (p => p._1 == p._2)`]",
167163
"sequenceEqual(Observable[_ <: T], Observable[_ <: T], Func2[_ >: T, _ >: T, Boolean])" -> "[use `(first zip second) map (p => equality(p._1, p._2))`]",
168164
"sum(Observable[Integer])" -> "sum(Numeric[U])",

0 commit comments

Comments
 (0)