Merge pull request #3651 from artem-zinnatullin/remove-redundant-final

1.x: Remove redundant "final" modifiers
ReactiveX · Jan 31, 2016 · be493f1 · be493f1
2 parents 503d369 + 9cf3754
commit be493f1
Show file tree

Hide file tree

Showing 14 changed files with 155 additions and 155 deletions.
diff --git a/src/main/java/rx/Observable.java b/src/main/java/rx/Observable.java
diff --git a/src/main/java/rx/Single.java b/src/main/java/rx/Single.java
diff --git a/src/main/java/rx/exceptions/CompositeException.java b/src/main/java/rx/exceptions/CompositeException.java
@@ -247,7 +247,7 @@ public String getMessage() {
         }
     }
 
-    private final List<Throwable> getListOfCauses(Throwable ex) {
+    private List<Throwable> getListOfCauses(Throwable ex) {
         List<Throwable> list = new ArrayList<Throwable>();
         Throwable root = ex.getCause();
         if (root == null) {

diff --git a/src/main/java/rx/internal/operators/OnSubscribeAmb.java b/src/main/java/rx/internal/operators/OnSubscribeAmb.java
@@ -278,7 +278,7 @@ private static final class AmbSubscriber<T> extends Subscriber<T> {
             request(requested);
         }
 
-        private final void requestMore(long n) {
+        private void requestMore(long n) {
             request(n);
         }
 

diff --git a/src/main/java/rx/internal/util/IndexedRingBuffer.java b/src/main/java/rx/internal/util/IndexedRingBuffer.java
@@ -58,7 +58,7 @@ protected IndexedRingBuffer<?> createObject() {
     };
 
     @SuppressWarnings("unchecked")
-    public final static <T> IndexedRingBuffer<T> getInstance() {
+    public static <T> IndexedRingBuffer<T> getInstance() {
         return (IndexedRingBuffer<T>) POOL.borrowObject();
     }
 

diff --git a/src/main/java/rx/internal/util/ScalarSynchronousObservable.java b/src/main/java/rx/internal/util/ScalarSynchronousObservable.java
@@ -78,7 +78,7 @@ static <T> Producer createProducer(Subscriber<? super T> s, T v) {
      * @param t the value to emit when requested
      * @return the new Observable
      */
-    public static final <T> ScalarSynchronousObservable<T> create(T t) {
+    public static <T> ScalarSynchronousObservable<T> create(T t) {
         return new ScalarSynchronousObservable<T>(t);
     }
 

diff --git a/src/main/java/rx/internal/util/atomic/SpscLinkedArrayQueue.java b/src/main/java/rx/internal/util/atomic/SpscLinkedArrayQueue.java
@@ -242,17 +242,17 @@ private void soConsumerIndex(long v) {
         CONSUMER_INDEX.lazySet(this, v);
     }
 
-    private static final int calcWrappedOffset(long index, int mask) {
+    private static int calcWrappedOffset(long index, int mask) {
         return calcDirectOffset((int)index & mask);
     }
-    private static final int calcDirectOffset(int index) {
+    private static int calcDirectOffset(int index) {
         return index;
     }
-    private static final void soElement(AtomicReferenceArray<Object> buffer, int offset, Object e) {
+    private static void soElement(AtomicReferenceArray<Object> buffer, int offset, Object e) {
         buffer.lazySet(offset, e);
     }
 
-    private static final <E> Object lvElement(AtomicReferenceArray<Object> buffer, int offset) {
+    private static <E> Object lvElement(AtomicReferenceArray<Object> buffer, int offset) {
         return buffer.get(offset);
     }
 

diff --git a/src/main/java/rx/internal/util/atomic/SpscUnboundedAtomicArrayQueue.java b/src/main/java/rx/internal/util/atomic/SpscUnboundedAtomicArrayQueue.java
@@ -243,17 +243,17 @@ private void soConsumerIndex(long v) {
         CONSUMER_INDEX.lazySet(this, v);
     }
 
-    private static final int calcWrappedOffset(long index, int mask) {
+    private static int calcWrappedOffset(long index, int mask) {
         return calcDirectOffset((int)index & mask);
     }
-    private static final int calcDirectOffset(int index) {
+    private static int calcDirectOffset(int index) {
         return index;
     }
-    private static final void soElement(AtomicReferenceArray<Object> buffer, int offset, Object e) {
+    private static void soElement(AtomicReferenceArray<Object> buffer, int offset, Object e) {
         buffer.lazySet(offset, e);
     }
 
-    private static final <E> Object lvElement(AtomicReferenceArray<Object> buffer, int offset) {
+    private static <E> Object lvElement(AtomicReferenceArray<Object> buffer, int offset) {
         return buffer.get(offset);
     }
 

diff --git a/src/main/java/rx/internal/util/unsafe/SpscUnboundedArrayQueue.java b/src/main/java/rx/internal/util/unsafe/SpscUnboundedArrayQueue.java
@@ -264,17 +264,17 @@ private void soConsumerIndex(long v) {
         UNSAFE.putOrderedLong(this, C_INDEX_OFFSET, v);
     }
 
-    private static final long calcWrappedOffset(long index, long mask) {
+    private static long calcWrappedOffset(long index, long mask) {
         return calcDirectOffset(index & mask);
     }
-    private static final long calcDirectOffset(long index) {
+    private static long calcDirectOffset(long index) {
         return REF_ARRAY_BASE + (index << REF_ELEMENT_SHIFT);
     }
-    private static final void soElement(Object[] buffer, long offset, Object e) {
+    private static void soElement(Object[] buffer, long offset, Object e) {
         UNSAFE.putOrderedObject(buffer, offset, e);
     }
 
-    private static final <E> Object lvElement(E[] buffer, long offset) {
+    private static <E> Object lvElement(E[] buffer, long offset) {
         return UNSAFE.getObjectVolatile(buffer, offset);
     }
 

diff --git a/src/main/java/rx/internal/util/unsafe/UnsafeAccess.java b/src/main/java/rx/internal/util/unsafe/UnsafeAccess.java
@@ -47,7 +47,7 @@ private UnsafeAccess() {
         UNSAFE = u;
     }
 
-    public static final boolean isUnsafeAvailable() {
+    public static boolean isUnsafeAvailable() {
         return UNSAFE != null;
     }
 

diff --git a/src/main/java/rx/observables/GroupedObservable.java b/src/main/java/rx/observables/GroupedObservable.java
@@ -85,7 +85,7 @@ public void call(Subscriber<? super T> s) {
      * @return a GroupedObservable that, when a {@link Subscriber} subscribes to it, will execute the specified
      *         function
      */
-    public final static <K, T> GroupedObservable<K, T> create(K key, OnSubscribe<T> f) {
+    public static <K, T> GroupedObservable<K, T> create(K key, OnSubscribe<T> f) {
         return new GroupedObservable<K, T>(key, f);
     }
 

diff --git a/src/main/java/rx/observers/Observers.java b/src/main/java/rx/observers/Observers.java
@@ -71,7 +71,7 @@ public static <T> Observer<T> empty() {
      * @return an {@code Observer} that calls {@code onNext} for each emitted item from the {@code Observable}
      *         the {@code Observer} subscribes to
      */
-    public static final <T> Observer<T> create(final Action1<? super T> onNext) {
+    public static <T> Observer<T> create(final Action1<? super T> onNext) {
         if (onNext == null) {
             throw new IllegalArgumentException("onNext can not be null");
         }
@@ -111,7 +111,7 @@ public final void onNext(T args) {
      *         the {@code Observer} subscribes to, and calls {@code onError} if the {@code Observable} notifies
      *         of an error
      */
-    public static final <T> Observer<T> create(final Action1<? super T> onNext, final Action1<Throwable> onError) {
+    public static <T> Observer<T> create(final Action1<? super T> onNext, final Action1<Throwable> onError) {
         if (onNext == null) {
             throw new IllegalArgumentException("onNext can not be null");
         }
@@ -157,7 +157,7 @@ public final void onNext(T args) {
      *         of an error, and calls {@code onComplete} if the {@code Observable} notifies that the observable
      *         sequence is complete
      */
-    public static final <T> Observer<T> create(final Action1<? super T> onNext, final Action1<Throwable> onError, final Action0 onComplete) {
+    public static <T> Observer<T> create(final Action1<? super T> onNext, final Action1<Throwable> onError, final Action0 onComplete) {
         if (onNext == null) {
             throw new IllegalArgumentException("onNext can not be null");
         }

diff --git a/src/main/java/rx/observers/Subscribers.java b/src/main/java/rx/observers/Subscribers.java
@@ -79,7 +79,7 @@ public void onNext(T t) {
      * @return a {@code Subscriber} that calls {@code onNext} for each emitted item from the {@code Observable}
      *         the {@code Subscriber} subscribes to
      */
-    public static final <T> Subscriber<T> create(final Action1<? super T> onNext) {
+    public static <T> Subscriber<T> create(final Action1<? super T> onNext) {
         if (onNext == null) {
             throw new IllegalArgumentException("onNext can not be null");
         }
@@ -119,7 +119,7 @@ public final void onNext(T args) {
      *         the {@code Subscriber} subscribes to, and calls {@code onError} if the {@code Observable}
      *         notifies of an error
      */
-    public static final <T> Subscriber<T> create(final Action1<? super T> onNext, final Action1<Throwable> onError) {
+    public static <T> Subscriber<T> create(final Action1<? super T> onNext, final Action1<Throwable> onError) {
         if (onNext == null) {
             throw new IllegalArgumentException("onNext can not be null");
         }
@@ -165,7 +165,7 @@ public final void onNext(T args) {
      *         of an error, and calls {@code onComplete} if the {@code Observable} notifies that the observable
      *         sequence is complete
      */
-    public static final <T> Subscriber<T> create(final Action1<? super T> onNext, final Action1<Throwable> onError, final Action0 onComplete) {
+    public static <T> Subscriber<T> create(final Action1<? super T> onNext, final Action1<Throwable> onError, final Action0 onComplete) {
         if (onNext == null) {
             throw new IllegalArgumentException("onNext can not be null");
         }

diff --git a/src/main/java/rx/subjects/ReplaySubject.java b/src/main/java/rx/subjects/ReplaySubject.java
@@ -299,7 +299,7 @@ public static <T> ReplaySubject<T> createWithTimeAndSize(long time, TimeUnit uni
      *          the shared state
      * @return the created subject
      */
-    static final <T> ReplaySubject<T> createWithState(final BoundedState<T> state,
+    static <T> ReplaySubject<T> createWithState(final BoundedState<T> state,
             Action1<SubjectObserver<T>> onStart) {
         SubjectSubscriptionManager<T> ssm = new SubjectSubscriptionManager<T>();
         ssm.onStart = onStart;