Merge pull request #1747 from akarnokd/Cleanup_Utility_Classes

Cleanup: final and utility classes

Author: benjchristensen

src/main/java/rx/Notification.java

@@ -20,7 +20,7 @@
  * 
  * @see <a href="http://msdn.microsoft.com/en-us/library/hh229462.aspx">the Microsoft Rx equivalent</a>
  */
-public class Notification<T> {
+public final class Notification<T> {
 
     private final Kind kind;
     private final Throwable throwable;

src/main/java/rx/exceptions/Exceptions.java

@@ -21,7 +21,7 @@
 /**
  * @warn javadoc class description missing
  */
-public class Exceptions {
+public final class Exceptions {
     private Exceptions() {
 
     }

src/main/java/rx/exceptions/OnErrorThrowable.java

@@ -21,7 +21,7 @@
  * recover more information from an {@code OnErrorThrowable} than is found in a typical {@code Throwable}, such
  * as the item the {@code Observable} was trying to emit at the time the error was encountered.
  */
-public class OnErrorThrowable extends RuntimeException {
+public final class OnErrorThrowable extends RuntimeException {
 
     private static final long serialVersionUID = -569558213262703934L;
 

src/main/java/rx/functions/Functions.java

@@ -15,7 +15,10 @@
  */
 package rx.functions;
 
-public class Functions {
+public final class Functions {
+    private Functions() {
+        throw new IllegalStateException("No instances!");
+    }
 
     /**
      * Converts a {@link Func0} to a {@link FuncN} to allow heterogeneous handling of functions with different

src/main/java/rx/internal/operators/BlockingOperatorMostRecent.java

@@ -29,7 +29,9 @@
  * <img width="640" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/B.mostRecent.png" alt="">
  */
 public final class BlockingOperatorMostRecent {
-
+    private BlockingOperatorMostRecent() {
+        throw new IllegalStateException("No instances!");
+    }
     /**
      * Returns an {@code Iterable} that always returns the item most recently emitted by the {@code Observable}.
      *
@@ -58,7 +60,7 @@ public Iterator<T> iterator() {
         };
     }
 
-    private static class MostRecentObserver<T> extends Subscriber<T> {
+    private static final class MostRecentObserver<T> extends Subscriber<T> {
         final NotificationLite<T> nl = NotificationLite.instance();
         volatile Object value;
 

src/main/java/rx/internal/operators/BlockingOperatorNext.java

@@ -33,6 +33,9 @@
  * <img width="640" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/B.next.png" alt="">
  */
 public final class BlockingOperatorNext {
+    private BlockingOperatorNext() {
+        throw new IllegalStateException("No instances!");
+    }
 
     /**
      * Returns an {@code Iterable} that blocks until the {@code Observable} emits another item, then returns

src/main/java/rx/internal/operators/BlockingOperatorToFuture.java

@@ -35,8 +35,10 @@
  * The toFuture operation throws an exception if the Observable emits more than one item. If the
  * Observable may emit more than item, use <code>toList().toFuture()</code>.
  */
-public class BlockingOperatorToFuture {
-
+public final class BlockingOperatorToFuture {
+    private BlockingOperatorToFuture() {
+        throw new IllegalStateException("No instances!");
+    }
     /**
      * Returns a Future that expects a single item from the observable.
      * 

src/main/java/rx/internal/operators/BlockingOperatorToIterator.java

@@ -34,7 +34,10 @@
  * 
  * @see <a href="https://github.com/ReactiveX/RxJava/issues/50">Issue #50</a>
  */
-public class BlockingOperatorToIterator {
+public final class BlockingOperatorToIterator {
+    private BlockingOperatorToIterator() {
+        throw new IllegalStateException("No instances!");
+    }
 
     /**
      * Returns an iterator that iterates all values of the observable.

src/main/java/rx/internal/operators/BufferUntilSubscriber.java

@@ -48,7 +48,7 @@
  * @param <T>
  *            the type of the items to be buffered
  */
-public class BufferUntilSubscriber<T> extends Subject<T, T> {
+public final class BufferUntilSubscriber<T> extends Subject<T, T> {
 
     /**
      * @warn create() undescribed

src/main/java/rx/internal/operators/OnSubscribeToObservableFuture.java

@@ -34,7 +34,11 @@
  * This is blocking so the {@code Subscription} returned when calling
  * {@code Observable.unsafeSubscribe(Observer)} does nothing.
  */
-public class OnSubscribeToObservableFuture {
+public final class OnSubscribeToObservableFuture {
+    private OnSubscribeToObservableFuture() {
+        throw new IllegalStateException("No instances!");
+    }
+
     /* package accessible for unit tests */static class ToObservableFuture<T> implements OnSubscribe<T> {
         private final Future<? extends T> that;
         private final long time;

src/main/java/rx/internal/operators/OperatorTimeoutBase.java

@@ -77,7 +77,7 @@ public Subscriber<? super T> call(Subscriber<? super T> subscriber) {
         return timeoutSubscriber;
     }
 
-    /* package-private */static class TimeoutSubscriber<T> extends
+    /* package-private */static final class TimeoutSubscriber<T> extends
             Subscriber<T> {
 
         private final SerialSubscription serial;

src/main/java/rx/internal/util/IndexedRingBuffer.java

@@ -46,7 +46,7 @@
  * 
  * @param <E>
  */
-public class IndexedRingBuffer<E> implements Subscription {
+public final class IndexedRingBuffer<E> implements Subscription {
 
     private static final ObjectPool<IndexedRingBuffer> POOL = new ObjectPool<IndexedRingBuffer>() {
 

src/main/java/rx/internal/util/unsafe/Pow2.java

@@ -16,7 +16,10 @@
  */
 package rx.internal.util.unsafe;
 
-public class Pow2 {
+public final class Pow2 {
+    private Pow2() {
+        throw new IllegalStateException("No instances!");
+    }
 
     /**
      * Find the next larger positive power of two value up from the given value. If value is a power of two then

src/main/java/rx/internal/util/unsafe/UnsafeAccess.java

@@ -24,6 +24,9 @@
  * otherwise NPEs will happen in environments without "suc.misc.Unsafe" such as Android.
  */
 public final class UnsafeAccess {
+    private UnsafeAccess() {
+        throw new IllegalStateException("No instances!");
+    }
 
     public static final Unsafe UNSAFE;
     static {

src/main/java/rx/observables/BlockingObservable.java

@@ -50,7 +50,7 @@
  * @param <T>
  *           the type of item emitted by the {@code BlockingObservable}
  */
-public class BlockingObservable<T> {
+public final class BlockingObservable<T> {
 
     private final Observable<? extends T> o;
 

src/main/java/rx/observers/Observers.java

@@ -23,7 +23,10 @@
 /**
  * Helper methods and utilities for creating and working with {@link Observer} objects.
  */
-public class Observers {
+public final class Observers {
+    private Observers() {
+        throw new IllegalStateException("No instances!");
+    }
 
     private static final Observer<Object> EMPTY = new Observer<Object>() {
 

src/main/java/rx/schedulers/NewThreadScheduler.java

@@ -22,7 +22,7 @@
 /**
  * Schedules work on a new thread.
  */
-public class NewThreadScheduler extends Scheduler {
+public final class NewThreadScheduler extends Scheduler {
 
     private static final String THREAD_NAME_PREFIX = "RxNewThreadScheduler-";
     private static final RxThreadFactory THREAD_FACTORY = new RxThreadFactory(THREAD_NAME_PREFIX);

src/main/java/rx/schedulers/TestScheduler.java

@@ -34,7 +34,7 @@ public class TestScheduler extends Scheduler {
     private final Queue<TimedAction> queue = new PriorityQueue<TimedAction>(11, new CompareActionsByTime());
     private static long counter = 0;
 
-    private static class TimedAction {
+    private static final class TimedAction {
 
         private final long time;
         private final Action0 action;

src/main/java/rx/schedulers/TrampolineScheduler.java

@@ -110,7 +110,7 @@ public boolean isUnsubscribed() {
 
     }
 
-    private static class TimedAction implements Comparable<TimedAction> {
+    private static final class TimedAction implements Comparable<TimedAction> {
         final Action0 action;
         final Long execTime;
         final int count; // In case if time between enqueueing took less than 1ms

src/main/java/rx/subscriptions/Subscriptions.java

@@ -26,6 +26,9 @@
  * Helper methods and utilities for creating and working with {@link Subscription} objects
  */
 public final class Subscriptions {
+    private Subscriptions() {
+        throw new IllegalStateException("No instances!");
+    }
     /**
      * Returns a {@link Subscription} that does nothing.
      * 

src/test/java/rx/EventStream.java

@@ -27,8 +27,10 @@
 /**
  * Utility for retrieving a mock eventstream for testing.
  */
-public class EventStream {
-
+public final class EventStream {
+    private EventStream() {
+        throw new IllegalStateException("No instances!");
+    }
     public static Observable<Event> getEventStream(final String type, final int numInstances) {
         return Observable.create(new OnSubscribe<Event>() {
 

src/test/java/rx/exceptions/OnNextValueTest.java

@@ -25,7 +25,7 @@
  * There is an added danger that if there is a bug in the toString method it will cause inconsistent exception creation. If the object throws an exception while rendering a string it will actually end up not seeing the real exception.
  */
 public final class OnNextValueTest {
-    private static class BadToString {
+    private static final class BadToString {
 
         private final boolean throwDuringToString;
 

src/test/java/rx/internal/operators/OperatorSubscribeOnTest.java

@@ -133,7 +133,7 @@ public Worker createWorker() {
             return new SlowInner(actual.createWorker());
         }
 
-        private class SlowInner extends Worker {
+        private final class SlowInner extends Worker {
 
             private final Scheduler.Worker actualInner;
 

src/test/java/rx/test/OperatorTester.java

@@ -20,7 +20,7 @@
 /**
  * Common utility functions for testing operator implementations.
  */
-public class OperatorTester {
+public final class OperatorTester {
     /*
      * This is purposefully package-only so it does not leak into the public API outside of this package.
      * 

src/test/java/rx/util/AssertObservable.java

@@ -20,7 +20,10 @@
 import rx.functions.Func1;
 import rx.functions.Func2;
 
-public class AssertObservable {
+public final class AssertObservable {
+    private AssertObservable() {
+        throw new IllegalStateException("No instances!");
+    }
     /**
      * Asserts that two Observables are equal. If they are not, an {@link AssertionError} is thrown
      * with the given message. If <code>expecteds</code> and <code>actuals</code> are