Merge pull request ReactiveX#1 from samuelgruetter/RxJavaBugFixesSam

A few trivial Scala adaptor details

Author: headinthebox

gradlew

@@ -12,8 +12,6 @@ DEFAULT_JVM_OPTS=""
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
-JAVA_HOME="/Library/Java/JavaVirtualMachines/jdk1.7.0_40.jdk/Contents/Home"
-
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 

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

@@ -427,40 +427,6 @@ class RxScalaDemo extends JUnitSuite {
     assertEquals("!!", Observable("a", "b", "c").drop(10).firstOrElse("!!").toBlockingObservable.single)
   }
 
-  @Test def observableLikeFuture1() {
-    implicit val scheduler = ThreadPoolForIOScheduler()
-    val o1 = Observable {
-      Thread.sleep(1000)
-      5
-    }
-    val o2 = Observable {
-      Thread.sleep(500)
-      4
-    }
-    Thread.sleep(500)
-    val t1 = System.currentTimeMillis
-    println((o1 merge o2).first.toBlockingObservable.single)
-    println(System.currentTimeMillis - t1)
-  }
-
-  @Test def ObservableLikeFuture2() {
-    class Friend {}
-    val session = new Object {
-      def getFriends: List[Friend] = List(new Friend, new Friend)
-    }
-
-    implicit val scheduler = ThreadPoolForIOScheduler()
-    val o: Observable[List[Friend]] = Observable {
-      session.getFriends
-    }
-    o.subscribe(
-      friendList => println(friendList),
-      err => println(err.getMessage)
-    )
-
-    Thread.sleep(1500) // or convert to BlockingObservable
-  }
-
   @Test def takeWhileWithIndexAlternative {
     val condition = true
     Observable("a", "b").zipWithIndex.takeWhile{case (elem, index) => condition}.map(_._1)

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

@@ -17,12 +17,11 @@ package rx.lang.scala
 
 import java.lang.Exception
 import java.{ lang => jlang }
-//import rx.lang.scala._
-import rx.util.functions._
+
 import scala.collection.Seq
-import java.{lang => jlang}
 import scala.language.implicitConversions
-//import rx.lang.scala.Scheduler
+
+import rx.util.functions._
 
 /**
  * These function conversions convert between Scala functions and Rx `Func`s and `Action`s.

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

@@ -280,8 +280,10 @@ trait Observable[+T]
    * corresponding elements using the selector function.
    * The number of `onNext` invocations of the resulting `Observable[(T, U)]`
    * is the minumum of the number of `onNext` invocations of `this` and `that`.
+   *
+   * Note that this function is private because Scala collections don't have such a function.
    */
-  def zip[U, R](that: Observable[U], selector: (T,U) => R): Observable[R] = {
+  private def zip[U, R](that: Observable[U], selector: (T,U) => R): Observable[R] = {
     Observable[R](rx.Observable.zip[T, U, R](this.asJavaObservable, that.asJavaObservable, selector))
   }
 

language-adaptors/rxjava-scala/src/main/scala/rx/lang/scala/concurrency/ThreadPoolForComputationScheduler.scala

@@ -26,9 +26,9 @@ object ThreadPoolForComputationScheduler {
    *
    * This can be used for event-loops, processing callbacks and other computational work.
    *
-   * Do not perform IO-bound work on this scheduler. Use [[rx.lang.scala.concurrency.Schedulers.threadPoolForIO]] instead.
+   * Do not perform IO-bound work on this scheduler. Use [[rx.lang.scala.concurrency.ThreadPoolForIOScheduler]] instead.
    */
-  def apply(): ThreadPoolForComputationScheduler =  {
+  def apply(): ThreadPoolForComputationScheduler = {
     new ThreadPoolForComputationScheduler(rx.concurrency.Schedulers.threadPoolForComputation())
   }
 }

language-adaptors/rxjava-scala/src/main/scala/rx/lang/scala/concurrency/ThreadPoolForIOScheduler.scala

@@ -26,9 +26,9 @@ object ThreadPoolForIOScheduler {
    *
    * This can be used for asynchronously performing blocking IO.
    *
-   * Do not perform computational work on this scheduler. Use [[rx.lang.scala.concurrency.Schedulers.threadPoolForComputation]] instead.
+   * Do not perform computational work on this scheduler. Use [[rx.lang.scala.concurrency.ThreadPoolForComputationScheduler]] instead.
    */
-  def apply(): ThreadPoolForIOScheduler =  {
+  def apply(): ThreadPoolForIOScheduler = {
     new ThreadPoolForIOScheduler(rx.concurrency.Schedulers.threadPoolForIO())
   }
 }

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

@@ -15,5 +15,9 @@
  */
 package rx.lang
 
-package object scala {
-}
+/**
+ * This package contains all classes that RxScala users need.
+ *
+ * It basically mirrors the structure of package `rx`, but some changes were made to make it more Scala-idiomatic.
+ */
+package object scala {}

language-adaptors/rxjava-scala/src/main/scala/rx/lang/scala/subjects/package.scala

@@ -0,0 +1,21 @@
+/**
+ * Copyright 2013 Netflix, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package rx.lang.scala
+
+/**
+ * Subjects are Observers and Observables at the same time.
+ */
+package object subjects {}

language-adaptors/rxjava-scala/src/test/scala/rx/lang/scala/subscriptions/SubscriptionTests.scala

@@ -4,6 +4,8 @@ import org.junit.Assert._
 import org.junit.Test
 import org.scalatest.junit.JUnitSuite
 
+import rx.lang.scala.Subscription
+
 class SubscriptionTests extends JUnitSuite {
 
   @Test