Remove type argument from CompletableSubject

Author: akarnokd

src/main/java/hu/akarnokd/rxjava2/subjects/CompletableSubject.java

@@ -31,34 +31,29 @@
  * <p>
  * The CompletableSubject doesn't store the Disposables coming through onSubscribe but
  * disposes them once the other onXXX methods were called (terminal state reached).
- * @param <T> the value type received and emitted
  */
-public final class CompletableSubject<T> extends Completable implements CompletableObserver {
+public final class CompletableSubject extends Completable implements CompletableObserver {
 
-    final AtomicReference<MaybeDisposable<T>[]> observers;
+    final AtomicReference<CompletableDisposable[]> observers;
 
-    @SuppressWarnings("rawtypes")
-    static final MaybeDisposable[] EMPTY = new MaybeDisposable[0];
+    static final CompletableDisposable[] EMPTY = new CompletableDisposable[0];
 
-    @SuppressWarnings("rawtypes")
-    static final MaybeDisposable[] TERMINATED = new MaybeDisposable[0];
+    static final CompletableDisposable[] TERMINATED = new CompletableDisposable[0];
 
     final AtomicBoolean once;
     Throwable error;
 
     /**
      * Creates a fresh CompletableSubject.
-     * @param <T> the value type received and emitted
      * @return the new CompletableSubject instance
      */
-    public static <T> CompletableSubject<T> create() {
-        return new CompletableSubject<T>();
+    public static CompletableSubject create() {
+        return new CompletableSubject();
     }
 
-    @SuppressWarnings("unchecked")
     CompletableSubject() {
         once = new AtomicBoolean();
-        observers = new AtomicReference<MaybeDisposable<T>[]>(EMPTY);
+        observers = new AtomicReference<CompletableDisposable[]>(EMPTY);
     }
 
     @Override
@@ -68,35 +63,33 @@ public void onSubscribe(Disposable d) {
         }
     }
 
-    @SuppressWarnings("unchecked")
     @Override
     public void onError(Throwable e) {
         if (e == null) {
             e = new NullPointerException("Null errors are not allowed in 2.x");
         }
         if (once.compareAndSet(false, true)) {
             this.error = e;
-            for (MaybeDisposable<T> md : observers.getAndSet(TERMINATED)) {
+            for (CompletableDisposable md : observers.getAndSet(TERMINATED)) {
                 md.actual.onError(e);
             }
         } else {
             RxJavaPlugins.onError(e);
         }
     }
 
-    @SuppressWarnings("unchecked")
     @Override
     public void onComplete() {
         if (once.compareAndSet(false, true)) {
-            for (MaybeDisposable<T> md : observers.getAndSet(TERMINATED)) {
+            for (CompletableDisposable md : observers.getAndSet(TERMINATED)) {
                 md.actual.onComplete();
             }
         }
     }
 
     @Override
     protected void subscribeActual(CompletableObserver observer) {
-        MaybeDisposable<T> md = new MaybeDisposable<T>(observer, this);
+        CompletableDisposable md = new CompletableDisposable(observer, this);
         observer.onSubscribe(md);
         if (add(md)) {
             if (md.isDisposed()) {
@@ -112,16 +105,16 @@ protected void subscribeActual(CompletableObserver observer) {
         }
     }
 
-    boolean add(MaybeDisposable<T> inner) {
+    boolean add(CompletableDisposable inner) {
         for (;;) {
-            MaybeDisposable<T>[] a = observers.get();
+            CompletableDisposable[] a = observers.get();
             if (a == TERMINATED) {
                 return false;
             }
 
             int n = a.length;
-            @SuppressWarnings("unchecked")
-            MaybeDisposable<T>[] b = new MaybeDisposable[n + 1];
+
+            CompletableDisposable[] b = new CompletableDisposable[n + 1];
             System.arraycopy(a, 0, b, 0, n);
             b[n] = inner;
             if (observers.compareAndSet(a, b)) {
@@ -130,10 +123,9 @@ boolean add(MaybeDisposable<T> inner) {
         }
     }
 
-    @SuppressWarnings("unchecked")
-    void remove(MaybeDisposable<T> inner) {
+    void remove(CompletableDisposable inner) {
         for (;;) {
-            MaybeDisposable<T>[] a = observers.get();
+            CompletableDisposable[] a = observers.get();
             int n = a.length;
             if (n == 0) {
                 return;
@@ -151,11 +143,11 @@ void remove(MaybeDisposable<T> inner) {
             if (j < 0) {
                 return;
             }
-            MaybeDisposable<T>[] b;
+            CompletableDisposable[] b;
             if (n == 1) {
                 b = EMPTY;
             } else {
-                b = new MaybeDisposable[n - 1];
+                b = new CompletableDisposable[n - 1];
                 System.arraycopy(a, 0, b, 0, j);
                 System.arraycopy(a, j + 1, b, j, n - j - 1);
             }
@@ -209,20 +201,20 @@ public boolean hasObservers() {
         return observers.get().length;
     }
 
-    static final class MaybeDisposable<T>
-    extends AtomicReference<CompletableSubject<T>> implements Disposable {
+    static final class CompletableDisposable
+    extends AtomicReference<CompletableSubject> implements Disposable {
         private static final long serialVersionUID = -7650903191002190468L;
 
         final CompletableObserver actual;
 
-        MaybeDisposable(CompletableObserver actual, CompletableSubject<T> parent) {
+        CompletableDisposable(CompletableObserver actual, CompletableSubject parent) {
             this.actual = actual;
             lazySet(parent);
         }
 
         @Override
         public void dispose() {
-            CompletableSubject<T> parent = getAndSet(null);
+            CompletableSubject parent = getAndSet(null);
             if (parent != null) {
                 parent.remove(this);
             }

src/test/java/hu/akarnokd/rxjava2/subjects/CompletableSubjectTest.java

@@ -34,7 +34,7 @@ public class CompletableSubjectTest {
 
     @Test
     public void once() {
-        CompletableSubject<Integer> ms = CompletableSubject.create();
+        CompletableSubject ms = CompletableSubject.create();
 
         TestObserver<Void> to = ms.test();
 
@@ -55,7 +55,7 @@ public void once() {
 
     @Test
     public void error() {
-        CompletableSubject<Integer> ms = CompletableSubject.create();
+        CompletableSubject ms = CompletableSubject.create();
 
         assertFalse(ms.hasComplete());
         assertFalse(ms.hasThrowable());
@@ -91,7 +91,7 @@ public void error() {
 
     @Test
     public void complete() {
-        CompletableSubject<Integer> ms = CompletableSubject.create();
+        CompletableSubject ms = CompletableSubject.create();
 
         assertFalse(ms.hasComplete());
         assertFalse(ms.hasThrowable());
@@ -127,7 +127,7 @@ public void complete() {
 
     @Test
     public void nullThrowable() {
-        CompletableSubject<Integer> ms = CompletableSubject.create();
+        CompletableSubject ms = CompletableSubject.create();
 
         TestObserver<Void> to = ms.test();
 
@@ -145,7 +145,7 @@ public void cancelOnArrival() {
 
     @Test
     public void cancelOnArrival2() {
-        CompletableSubject<Integer> ms = CompletableSubject.create();
+        CompletableSubject ms = CompletableSubject.create();
 
         ms.test();
 
@@ -187,7 +187,7 @@ public void onComplete() {
 
     @Test
     public void onSubscribeDispose() {
-        CompletableSubject<Integer> ms = CompletableSubject.create();
+        CompletableSubject ms = CompletableSubject.create();
 
         Disposable d = Disposables.empty();
 
@@ -207,7 +207,7 @@ public void onSubscribeDispose() {
     @Test
     public void addRemoveRace() {
         for (int i = 0; i < 500; i++) {
-            final CompletableSubject<Integer> ms = CompletableSubject.create();
+            final CompletableSubject ms = CompletableSubject.create();
 
             final TestObserver<Void> to = ms.test();