refactoring package structure

Author: samuelgruetter

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

@@ -1,5 +1,61 @@
 package rx.lang
 
+
+/*
+ * This object contains aliases to all types Scala users need to import.
+ * Note that:
+ * -  Scala users cannot use Java's type with variance without always using writing
+ *    e.g. rx.Notification[_ <: T], so we create aliases fixing the variance
+ * -  For consistency, we create aliases for all types
+ * -  Type aliases cannot be at top level, they have to be inside an object or class
+ * -  It's possible to make a "package object" instead of "object", but if there's a
+ *    package with the same name as the package object, the gradle builder fails
+ *    (the eclipse builder works). Using -Yresolve-term-conflict:package
+ *    or -Yresolve-term-conflict:object as scalac options didn't help.
+ *    See also http://stackoverflow.com/questions/8984730/package-contains-object-and-package-with-same-name
+ */
+object scala {
+
+  type Notification[+T] = rx.Notification[_ <: T]
+  object Notification {
+    def apply[T](): Notification[T] = new rx.Notification()
+    def apply[T](value: T): Notification[T] = new rx.Notification(value)
+    def apply[T](t: Throwable): Notification[T] = new rx.Notification(t)
+  }
+  
+  type Observable[+T] = rx.lang.scalaimpl.Observable[T]
+  val Observable = rx.lang.scalaimpl.Observable
+  type Observer[-T] = rx.Observer[_ >: T]  
+  type Scheduler = rx.Scheduler
+  type Subscription = rx.Subscription
+
+  object util {
+    type Closing = rx.util.Closing
+
+    // TODO rx.util.Closings
+
+    type CompositeException = rx.util.CompositeException
+
+    // TODO rx.util.Exceptions
+
+    // rx.util.OnErrorNotImplementedException TODO what's this?
+
+    type Opening = rx.util.Opening
+
+    // rx.util.Openings // TODO
+
+    // rx.util.Range // TODO do we need this? Or the Scala Range?
+
+    type Timestamped[+T] = rx.util.Timestamped[_ <: T]
+    object Timestamped {
+      def apply[T](timestampMillis: Long, value: T): Timestamped[T] = {
+        new rx.util.Timestamped(timestampMillis, value)
+      }
+    }
+  }
+  
+}
+
 /*
 
 TODO make aliases for these types because:
@@ -31,22 +87,5 @@ rx.subscriptions.BooleanSubscription
 rx.subscriptions.CompositeSubscription
 rx.subscriptions.Subscriptions
 
-
-
 */
 
-package object scala {
-  
-  type Notification[+T] = rx.Notification[_ <: T]
-  object Notification {
-    def apply[T](): Notification[T] = new rx.Notification()
-    def apply[T](value: T): Notification[T] = new rx.Notification(value)
-    def apply[T](t: Throwable): Notification[T] = new rx.Notification(t)
-  }
-  
-  // Observable is not here because it's a full-fledged class
-  type Observer[-T] = rx.Observer[_ >: T]  
-  type Scheduler = rx.Scheduler
-  type Subscription = rx.Subscription
-}
-

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

@@ -1,4 +1,4 @@
-package rx.lang.scala.observables
+package rx.lang.scalaimpl
 
 import scala.collection.JavaConverters._
 

language-adaptors/rxjava-scala/src/main/scala/rx/lang/scala/observables/BlockingObservable.scala renamed to language-adaptors/rxjava-scala/src/main/scala/rx/lang/scalaimpl/BlockingObservable.scala

@@ -1,10 +1,10 @@
-package rx.lang.scala.observables
+package rx.lang.scalaimpl
 
 
 class ConnectableObservable[+T](val asJava: rx.observables.ConnectableObservable[_ <: T]) extends AnyVal {
   import rx.lang.scala._
   import rx.lang.scala.util._
   import rx.{Observable => JObservable}
-  import rx.lang.scala.internal.ImplicitFunctionConversions._
+  import rx.lang.scalaimpl.ImplicitFunctionConversions._
 
 }

language-adaptors/rxjava-scala/src/main/scala/rx/lang/scala/observables/ConnectableObservable.scala renamed to language-adaptors/rxjava-scala/src/main/scala/rx/lang/scalaimpl/ConnectableObservable.scala

@@ -2,7 +2,7 @@
 /*
  * These function conversions are only used by the ScalaAdapter, users of RxScala don't need them.
  */
-package rx.lang.scala.internal
+package rx.lang.scalaimpl
 
 
 import java.{lang => jlang}
@@ -16,6 +16,8 @@ import rx.util.functions.Func4
 import java.{lang => jlang}
 import rx.Observer
 import rx.Subscription
+import java.{lang => jlang}
+import scala.language.implicitConversions
 
 object ImplicitFunctionConversions {
     // code below is copied from

language-adaptors/rxjava-scala/src/main/scala/rx/lang/scala/internal/ImplicitFunctionConversions.scala renamed to language-adaptors/rxjava-scala/src/main/scala/rx/lang/scalaimpl/ImplicitFunctionConversions.scala

@@ -15,7 +15,9 @@
  */
 
 
-package rx.lang.scala
+package rx.lang.scalaimpl
+
+import org.scalatest.junit.JUnitSuite
 
 
 /**
@@ -29,9 +31,9 @@ class Observable[+T](val asJava: rx.Observable[_ <: T])
   import scala.collection.JavaConverters._
   import scala.concurrent.duration.Duration
   import rx.{Observable => JObservable}
+  import rx.lang.scala.{Notification, Subscription, Scheduler, Observer}
   import rx.lang.scala.util._
-  import rx.lang.scala.observables._
-  import rx.lang.scala.internal.ImplicitFunctionConversions._
+  import rx.lang.scalaimpl.ImplicitFunctionConversions._
 
   /**
    * An {@link Observer} must call an Observable's {@code subscribe} method in order to
@@ -1258,7 +1260,9 @@ object Observable {
   import scala.concurrent.duration.Duration
   import scala.concurrent.Future
   import rx.{Observable => JObservable}
-  import rx.lang.scala.internal.ImplicitFunctionConversions._
+  import rx.lang.scala.{Notification, Subscription, Scheduler, Observer}
+  import rx.lang.scala.util._
+  import rx.lang.scalaimpl.ImplicitFunctionConversions._
 
   /**
    * Creates an Observable that will execute the given function when an {@link Observer} subscribes to it.
@@ -1598,8 +1602,8 @@ object Observable {
 // Cannot yet have inner class because of this error message:
 // implementation restriction: nested class is not allowed in value class.
 // This restriction is planned to be removed in subsequent releases.  
-class WithFilter[+T] private[scala] (p: T => Boolean, wrapped: rx.Observable[_ <: T]) {
-  import rx.lang.scala.internal.ImplicitFunctionConversions._
+class WithFilter[+T] private[scalaimpl] (p: T => Boolean, wrapped: rx.Observable[_ <: T]) {
+  import rx.lang.scalaimpl.ImplicitFunctionConversions._
 
   def map[B](f: T => B): Observable[B] = new Observable(wrapped.filter(p).map(f))
   def flatMap[B](f: T => Observable[B]): Observable[B] = {
@@ -1609,8 +1613,6 @@ class WithFilter[+T] private[scala] (p: T => Boolean, wrapped: rx.Observable[_ <
   def withFilter(p: T => Boolean): Observable[T] = new Observable(wrapped.filter(p))
 }
 
-import org.scalatest.junit.JUnitSuite
-
 class UnitTestSuite extends JUnitSuite {
   import scala.concurrent.duration._
   import org.junit.{Before, Test, Ignore}

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

@@ -1,8 +1,11 @@
-package rx.lang.scala
+package rx.lang.scalatests
 
 import org.scalatest.junit.JUnitSuite
+
+import rx.lang.scala._
 import scala.concurrent.duration._
 import org.junit.{Before, Test, Ignore}
+
 import org.junit.Assert._
 
 class RxScalaDemo extends JUnitSuite {