remove withIndex() and joinToString()

Author: thomasnield

gradle.properties

@@ -1,2 +1,2 @@
-version=1.0.0-RC1-SNAPSHOT
+version=1.0.0-RC3
 org.gradle.jvmargs=-Xms256m -Xmx1024m -XX:MaxPermSize=256m

src/main/kotlin/rx/lang/kotlin/observables.kt

@@ -44,11 +44,6 @@ fun <T : Any> Observable<T?>.requireNoNulls(): Observable<T> = map { it ?: throw
  */
 @Suppress("UNCHECKED_CAST") fun <T : Any> Observable<T?>.filterNotNull(): Observable<T> = filter { it != null } as Observable<T>
 
-/**
- * Returns Observable that wrap all values into [IndexedValue] and populates corresponding index value.
- */
-fun <T> Observable<T>.withIndex(): Observable<IndexedValue<T>> =
-        zipWith(Observable.range(0, Int.MAX_VALUE)) { value, index -> IndexedValue(index, value) }
 
 /**
  * Returns Observable that emits objects from kotlin [Sequence] returned by function you provided by parameter [body] for

src/main/kotlin/rx/lang/kotlin/operators.kt

@@ -20,21 +20,3 @@ fun <T> Observable<Observable<T>>.switchLatest() = switchMap { it }
 
 fun <T> Observable<Observable<T>>.switchOnNext(): Observable<T> = Observable.switchOnNext(this)
 
-
-/**
- * Joins the emissions of a finite `Observable` into a `String`.
- *
- * @param separator is the dividing character(s) between each element in the concatenated `String`
- *
- * @param prefix is the preceding `String` before the concatenated elements (optional)
- *
- * @param postfix is the succeeding `String` after the concatenated elements (optional)
- */
-fun <T> Observable<T>.joinToString(separator: String? = null,
-                                   prefix: String? = null,
-                                   postfix: String? = null
-) = withIndex()
-        .collect( { StringBuilder(prefix ?: "") },
-            { builder: StringBuilder, next: IndexedValue<T> -> builder.append(if (next.index == 0) "" else separator ?: "").append(next.value) }
-        )
-        .map {  it.append(postfix ?: "").toString() }

src/test/kotlin/rx/lang/kotlin/ExtensionTests.kt

@@ -248,25 +248,6 @@ class ExtensionTests : KotlinTests() {
         inOrder.verifyNoMoreInteractions()
     }
 
-    @Test
-    fun testJoinToString1() {
-
-        val result = Observable.range(1,5)
-                .joinToString(separator = ",")
-                .toBlocking().first()
-
-        assertTrue(result == "1,2,3,4,5")
-    }
-    @Test
-    fun testJoinToString2() {
-
-        val result = Observable.range(1,5)
-                .joinToString(separator = ",", prefix = "(", postfix = ")")
-                .toBlocking().first()
-
-        assertTrue(result == "(1,2,3,4,5)")
-    }
-
     val funOnSubscribe: (Int, Subscriber<in String>) -> Unit = { counter, subscriber ->
         subscriber.onNext("hello_$counter")
         subscriber.onCompleted()

src/test/kotlin/rx/lang/kotlin/ObservablesTest.kt

@@ -100,30 +100,6 @@ class ObservablesTest {
         }
     }
 
-    @Test fun testWithIndex() {
-        listOf("a", "b", "c").toObservable().
-                withIndex().
-                toList().
-                forEach {
-                    assertEquals(listOf(IndexedValue(0, "a"), IndexedValue(1, "b"), IndexedValue(2, "c")), it)
-                }
-    }
-
-    @Test fun `withIndex() shouldn't share index between multiple subscribers`() {
-        val o = listOf("a", "b", "c").toObservable().withIndex()
-
-        val subscriber1 = TestSubscriber<IndexedValue<String>>()
-        val subscriber2 = TestSubscriber<IndexedValue<String>>()
-
-        o.subscribe(subscriber1)
-        o.subscribe(subscriber2)
-
-        subscriber1.awaitTerminalEvent()
-        subscriber1.assertValues(IndexedValue(0, "a"), IndexedValue(1, "b"), IndexedValue(2, "c"))
-
-        subscriber2.awaitTerminalEvent()
-        subscriber2.assertValues(IndexedValue(0, "a"), IndexedValue(1, "b"), IndexedValue(2, "c"))
-    }
 
     @Test fun `kotlin sequence should produce expected items and observable be able to handle em`() {
         kotlin.sequences.generateSequence(0) { it + 1 }.toObservable().take(3).toList().forEach {