Migrate code to use rx.schedulers instead of rx.concurrency

Unit tests passed before and after (did change in multiple steps to assert unit test pass against rx.concurrency before migrating to rx.schedulers).

Author: benjchristensen

language-adaptors/rxjava-groovy/src/test/groovy/rx/lang/groovy/TestParallel.groovy

@@ -19,7 +19,7 @@ import org.junit.Test
 
 import rx.Observable
 import rx.Scheduler
-import rx.concurrency.Schedulers
+import rx.schedulers.Schedulers
 import rx.util.functions.Func1
 
 class TestParallel {

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

@@ -204,11 +204,11 @@ trait Scheduler {
 
 private [scala] object Scheduler {
   def apply(scheduler: rx.Scheduler): Scheduler = scheduler match {
-    case s: rx.concurrency.CurrentThreadScheduler => new CurrentThreadScheduler(s)
-    case s: rx.concurrency.ExecutorScheduler => new ExecutorScheduler(s)
-    case s: rx.concurrency.ImmediateScheduler => new ImmediateScheduler(s)
-    case s: rx.concurrency.NewThreadScheduler => new NewThreadScheduler(s)
-    case s: rx.concurrency.TestScheduler => new TestScheduler(s)
+    case s: rx.schedulers.CurrentThreadScheduler => new CurrentThreadScheduler(s)
+    case s: rx.schedulers.ExecutorScheduler => new ExecutorScheduler(s)
+    case s: rx.schedulers.ImmediateScheduler => new ImmediateScheduler(s)
+    case s: rx.schedulers.NewThreadScheduler => new NewThreadScheduler(s)
+    case s: rx.schedulers.TestScheduler => new TestScheduler(s)
     case s: rx.Scheduler => new Scheduler{ val asJavaScheduler = s }
   }
 

language-adaptors/rxjava-scala/src/main/scala/rx/lang/scala/schedulers/CurrentThreadScheduler.scala

@@ -23,7 +23,7 @@ object CurrentThreadScheduler {
    * Returns a [[rx.lang.scala.Scheduler]] that queues work on the current thread to be executed after the current work completes.
    */
   def apply(): CurrentThreadScheduler =  {
-    new CurrentThreadScheduler(rx.concurrency.Schedulers.currentThread())
+    new CurrentThreadScheduler(rx.schedulers.Schedulers.currentThread())
   }
 }
 

language-adaptors/rxjava-scala/src/main/scala/rx/lang/scala/schedulers/ExecutorScheduler.scala

@@ -26,7 +26,7 @@ object ExecutorScheduler {
   * Note that this does not support scheduled actions with a delay.
   */
   def apply(executor: Executor): ExecutorScheduler =  {
-    new ExecutorScheduler(rx.concurrency.Schedulers.executor(executor))
+    new ExecutorScheduler(rx.schedulers.Schedulers.executor(executor))
   }
 }
 

language-adaptors/rxjava-scala/src/main/scala/rx/lang/scala/schedulers/ImmediateScheduler.scala

@@ -23,7 +23,7 @@ object ImmediateScheduler {
    * Returns a [[rx.lang.scala.Scheduler]] that executes work immediately on the current thread.
    */
   def apply(): ImmediateScheduler =  {
-    new ImmediateScheduler(rx.concurrency.Schedulers.immediate())
+    new ImmediateScheduler(rx.schedulers.Schedulers.immediate())
   }
 }
 

language-adaptors/rxjava-scala/src/main/scala/rx/lang/scala/schedulers/NewThreadScheduler.scala

@@ -23,7 +23,7 @@ object NewThreadScheduler {
    * Returns a [[rx.lang.scala.Scheduler]] that creates a new {@link Thread} for each unit of work.
    */
   def apply(): NewThreadScheduler =  {
-    new NewThreadScheduler(rx.concurrency.Schedulers.newThread())
+    new NewThreadScheduler(rx.schedulers.Schedulers.newThread())
   }
 }
 

language-adaptors/rxjava-scala/src/main/scala/rx/lang/scala/schedulers/ScheduledExecutorServiceScheduler.scala

@@ -24,7 +24,7 @@ object ScheduledExecutorServiceScheduler {
    * Returns a [[rx.lang.scala.Scheduler]] that queues work on an `java.util.concurrent.ScheduledExecutorService`.
    */
   def apply(executor: ScheduledExecutorService): ScheduledExecutorServiceScheduler =  {
-    new ScheduledExecutorServiceScheduler(rx.concurrency.Schedulers.executor(executor))
+    new ScheduledExecutorServiceScheduler(rx.schedulers.Schedulers.executor(executor))
   }
 }
 

language-adaptors/rxjava-scala/src/main/scala/rx/lang/scala/schedulers/TestScheduler.scala

@@ -23,7 +23,7 @@ import rx.lang.scala.Scheduler
  */
 object TestScheduler {
   def apply(): TestScheduler = {
-    new TestScheduler(new rx.concurrency.TestScheduler())
+    new TestScheduler(new rx.schedulers.TestScheduler())
   }
 }
 
@@ -64,7 +64,7 @@ object TestScheduler {
  * }
  * }}}
  */
-class TestScheduler private[scala] (val asJavaScheduler: rx.concurrency.TestScheduler) extends Scheduler {
+class TestScheduler private[scala] (val asJavaScheduler: rx.schedulers.TestScheduler) extends Scheduler {
 
   def advanceTimeBy(time: Duration) {
     asJavaScheduler.advanceTimeBy(time.length, time.unit)

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

@@ -29,7 +29,7 @@ object ThreadPoolForComputationScheduler {
    * Do not perform IO-bound work on this scheduler. Use [[rx.lang.scala.schedulers.ThreadPoolForIOScheduler]] instead.
    */
   def apply(): ThreadPoolForComputationScheduler = {
-    new ThreadPoolForComputationScheduler(rx.concurrency.Schedulers.threadPoolForComputation())
+    new ThreadPoolForComputationScheduler(rx.schedulers.Schedulers.threadPoolForComputation())
   }
 }
 

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

@@ -29,7 +29,7 @@ object ThreadPoolForIOScheduler {
    * Do not perform computational work on this scheduler. Use [[rx.lang.scala.schedulers.ThreadPoolForComputationScheduler]] instead.
    */
   def apply(): ThreadPoolForIOScheduler = {
-    new ThreadPoolForIOScheduler(rx.concurrency.Schedulers.threadPoolForIO())
+    new ThreadPoolForIOScheduler(rx.schedulers.Schedulers.threadPoolForIO())
   }
 }