Skip to content

Commit 315a994

Browse files
Merge pull request #1057 from zsxwing/issue-1044
Fix issue #1044
2 parents fb46392 + f959dfd commit 315a994

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -578,7 +578,7 @@ class RxScalaDemo extends JUnitSuite {
578578

579579
@Test def elementAtExample(): Unit = {
580580
val o = List("red", "green", "blue").toObservable
581-
println(o(2).toBlockingObservable.single)
581+
println(o.elementAt(2).toBlockingObservable.single)
582582
}
583583

584584
@Test def elementAtOrDefaultExample(): Unit = {
@@ -609,4 +609,14 @@ class RxScalaDemo extends JUnitSuite {
609609
val m = o.toMap(keySelector, valueSelector, mapFactory)
610610
println(m.toBlockingObservable.single)
611611
}
612+
613+
@Test def retryExample1(): Unit = {
614+
val o : Observable[String] = List("alice", "bob", "carol").toObservable
615+
assertEquals(List("alice", "bob", "carol"), o.retry.toBlockingObservable.toList)
616+
}
617+
618+
@Test def retryExample2(): Unit = {
619+
val o : Observable[String] = List("alice", "bob", "carol").toObservable
620+
assertEquals(List("alice", "bob", "carol"), o.retry(3).toBlockingObservable.toList)
621+
}
612622
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2115,7 +2115,7 @@ trait Observable[+T]
21152115
* emits [1, 2, 3, 4, 5] then the complete output would be [1, 2, 1, 2, 3, 4, 5, onCompleted].
21162116
* @return Observable with retry logic.
21172117
*/
2118-
def retry: Observable[T] = {
2118+
def retry(): Observable[T] = {
21192119
toScalaObservable[T](asJavaObservable.retry())
21202120
}
21212121

@@ -2350,6 +2350,7 @@ trait Observable[+T]
23502350
* @throws IndexOutOfBoundsException
23512351
* if index is less than 0
23522352
* @see `Observable.elementAt`
2353+
* @deprecated("Use `elementAt`", "0.18.0")
23532354
*/
23542355
def apply(index: Int): Observable[T] = elementAt(index)
23552356

0 commit comments

Comments
 (0)