Move Exception Classes to rx.exceptions

Eliminate dumping ground of rx.util

Author: benjchristensen

rxjava-core/src/main/java/rx/Observable.java

@@ -24,6 +24,8 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 
+import rx.exceptions.Exceptions;
+import rx.exceptions.OnErrorNotImplementedException;
 import rx.joins.Pattern2;
 import rx.joins.Plan0;
 import rx.observables.BlockingObservable;
@@ -120,8 +122,6 @@
 import rx.subjects.ReplaySubject;
 import rx.subjects.Subject;
 import rx.subscriptions.Subscriptions;
-import rx.util.Exceptions;
-import rx.util.OnErrorNotImplementedException;
 import rx.util.TimeInterval;
 import rx.util.Timestamped;
 import rx.util.functions.Action0;

rxjava-core/src/main/java/rx/util/CompositeException.java renamed to rxjava-core/src/main/java/rx/exceptions/CompositeException.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package rx.util;
+package rx.exceptions;
 
 import java.util.ArrayList;
 import java.util.Collection;

rxjava-core/src/main/java/rx/util/Exceptions.java renamed to rxjava-core/src/main/java/rx/exceptions/Exceptions.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package rx.util;
+package rx.exceptions;
 
 public class Exceptions {
     private Exceptions() {

rxjava-core/src/main/java/rx/util/OnErrorNotImplementedException.java renamed to rxjava-core/src/main/java/rx/exceptions/OnErrorNotImplementedException.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package rx.util;
+package rx.exceptions;
 
 import rx.Subscriber;
 

rxjava-core/src/main/java/rx/observers/Observers.java

@@ -1,7 +1,7 @@
 package rx.observers;
 
 import rx.Observer;
-import rx.util.OnErrorNotImplementedException;
+import rx.exceptions.OnErrorNotImplementedException;
 import rx.util.functions.Action0;
 import rx.util.functions.Action1;
 

rxjava-core/src/main/java/rx/observers/SafeSubscriber.java

@@ -19,10 +19,10 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import rx.Subscriber;
+import rx.exceptions.CompositeException;
+import rx.exceptions.Exceptions;
+import rx.exceptions.OnErrorNotImplementedException;
 import rx.plugins.RxJavaPlugins;
-import rx.util.CompositeException;
-import rx.util.Exceptions;
-import rx.util.OnErrorNotImplementedException;
 
 /**
  * Wrapper around Observer to ensure compliance with Rx contract.

rxjava-core/src/main/java/rx/observers/Subscribers.java

@@ -2,7 +2,7 @@
 
 import rx.Observer;
 import rx.Subscriber;
-import rx.util.OnErrorNotImplementedException;
+import rx.exceptions.OnErrorNotImplementedException;
 import rx.util.functions.Action0;
 import rx.util.functions.Action1;
 

rxjava-core/src/main/java/rx/operators/OperationLatest.java

@@ -23,7 +23,7 @@
 import rx.Notification;
 import rx.Observable;
 import rx.Observer;
-import rx.util.Exceptions;
+import rx.exceptions.Exceptions;
 
 /**
  * Wait for and iterate over the latest values of the source observable.

rxjava-core/src/main/java/rx/operators/OperationMergeDelayError.java

@@ -24,10 +24,10 @@
 import rx.Observable.OnSubscribeFunc;
 import rx.Observer;
 import rx.Subscription;
+import rx.exceptions.CompositeException;
 import rx.observers.SynchronizedObserver;
 import rx.subscriptions.BooleanSubscription;
 import rx.subscriptions.CompositeSubscription;
-import rx.util.CompositeException;
 
 /**
  * This behaves like {@link OperatorMerge} except that if any of the merged Observables notify of

rxjava-core/src/main/java/rx/operators/OperationMostRecent.java

@@ -21,7 +21,7 @@
 
 import rx.Observable;
 import rx.Observer;
-import rx.util.Exceptions;
+import rx.exceptions.Exceptions;
 
 /**
  * Returns an Iterable that always returns the item most recently emitted by an Observable, or a

rxjava-core/src/main/java/rx/operators/OperationNext.java

@@ -24,7 +24,7 @@
 import rx.Notification;
 import rx.Observable;
 import rx.Observer;
-import rx.util.Exceptions;
+import rx.exceptions.Exceptions;
 
 /**
  * Returns an Iterable that blocks until the Observable emits another item, then returns that item.

rxjava-core/src/main/java/rx/operators/OperationOnErrorResumeNextViaFunction.java

@@ -22,8 +22,8 @@
 import rx.Observable.OnSubscribeFunc;
 import rx.Observer;
 import rx.Subscription;
+import rx.exceptions.CompositeException;
 import rx.subscriptions.Subscriptions;
-import rx.util.CompositeException;
 import rx.util.functions.Action0;
 import rx.util.functions.Func1;
 

rxjava-core/src/main/java/rx/operators/OperationOnErrorReturn.java

@@ -22,8 +22,8 @@
 import rx.Observable.OnSubscribeFunc;
 import rx.Observer;
 import rx.Subscription;
+import rx.exceptions.CompositeException;
 import rx.subscriptions.Subscriptions;
-import rx.util.CompositeException;
 import rx.util.functions.Action0;
 import rx.util.functions.Func1;
 

rxjava-core/src/main/java/rx/operators/OperationToIterator.java

@@ -23,7 +23,7 @@
 import rx.Notification;
 import rx.Observable;
 import rx.Observer;
-import rx.util.Exceptions;
+import rx.exceptions.Exceptions;
 
 /**
  * Returns an Iterator that iterates over all items emitted by a specified Observable.

rxjava-core/src/main/java/rx/operators/OperatorTimeoutWithSelector.java

@@ -18,8 +18,8 @@
 import rx.Observable;
 import rx.Subscriber;
 import rx.Subscription;
+import rx.exceptions.Exceptions;
 import rx.subscriptions.Subscriptions;
-import rx.util.Exceptions;
 import rx.util.functions.Func0;
 import rx.util.functions.Func1;
 

rxjava-core/src/main/java/rx/operators/SafeObserver.java

@@ -20,11 +20,11 @@
 
 import rx.Observer;
 import rx.Subscription;
+import rx.exceptions.CompositeException;
+import rx.exceptions.OnErrorNotImplementedException;
 import rx.observers.SynchronizedObserver;
 import rx.plugins.RxJavaPlugins;
 import rx.subscriptions.Subscriptions;
-import rx.util.CompositeException;
-import rx.util.OnErrorNotImplementedException;
 
 /**
  * Wrapper around Observer to ensure compliance with Rx contract.

rxjava-core/src/main/java/rx/subscriptions/CompositeSubscription.java

@@ -20,7 +20,7 @@
 import java.util.concurrent.atomic.AtomicReference;
 
 import rx.Subscription;
-import rx.util.CompositeException;
+import rx.exceptions.CompositeException;
 
 /**
  * Subscription that represents a group of Subscriptions that are unsubscribed

rxjava-core/src/test/java/rx/util/CompositeExceptionTest.java renamed to rxjava-core/src/test/java/rx/exceptions/CompositeExceptionTest.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package rx.util;
+package rx.exceptions;
 
 import static org.junit.Assert.*;
 
@@ -23,6 +23,10 @@
 
 import org.junit.Test;
 
+import rx.util.CompositeException.CompositeExceptionCausalChain;
+
+import rx.exceptions.CompositeException;
+
 public class CompositeExceptionTest {
 
     private final Throwable ex1 = new Throwable("Ex1");

rxjava-core/src/test/java/rx/util/ExceptionsTest.java renamed to rxjava-core/src/test/java/rx/exceptions/ExceptionsTest.java

@@ -13,12 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package rx.util;
+package rx.exceptions;
 
 import org.junit.Test;
 
 import rx.Observable;
 import rx.Observer;
+import rx.exceptions.OnErrorNotImplimport rx.util.OnErrorNotImplementedException;
+ementedException;
 import rx.subjects.PublishSubject;
 import rx.util.functions.Action1;
 

rxjava-core/src/test/java/rx/observers/SafeObserverTest.java

@@ -22,9 +22,9 @@
 import org.junit.Test;
 
 import rx.Subscriber;
+import rx.exceptions.CompositeException;
+import rx.exceptions.OnErrorNotImplementedException;
 import rx.subscriptions.Subscriptions;
-import rx.util.CompositeException;
-import rx.util.OnErrorNotImplementedException;
 import rx.util.functions.Action0;
 
 public class SafeObserverTest {

rxjava-core/src/test/java/rx/operators/OperationMergeDelayErrorTest.java

@@ -31,8 +31,8 @@
 import rx.Observable;
 import rx.Observer;
 import rx.Subscription;
+import rx.exceptions.CompositeException;
 import rx.subscriptions.Subscriptions;
-import rx.util.CompositeException;
 
 public class OperationMergeDelayErrorTest {
 

rxjava-core/src/test/java/rx/subscriptions/CompositeSubscriptionTest.java

@@ -25,7 +25,7 @@
 import org.junit.Test;
 
 import rx.Subscription;
-import rx.util.CompositeException;
+import rx.exceptions.CompositeException;
 
 public class CompositeSubscriptionTest {