Skip to content

Commit be493f1

Browse files
committed
Merge pull request #3651 from artem-zinnatullin/remove-redundant-final
1.x: Remove redundant "final" modifiers
2 parents 503d369 + 9cf3754 commit be493f1

14 files changed

+155
-155
lines changed

src/main/java/rx/Observable.java

Lines changed: 97 additions & 97 deletions
Large diffs are not rendered by default.

src/main/java/rx/Single.java

Lines changed: 33 additions & 33 deletions
Large diffs are not rendered by default.

src/main/java/rx/exceptions/CompositeException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ public String getMessage() {
247247
}
248248
}
249249

250-
private final List<Throwable> getListOfCauses(Throwable ex) {
250+
private List<Throwable> getListOfCauses(Throwable ex) {
251251
List<Throwable> list = new ArrayList<Throwable>();
252252
Throwable root = ex.getCause();
253253
if (root == null) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ private static final class AmbSubscriber<T> extends Subscriber<T> {
278278
request(requested);
279279
}
280280

281-
private final void requestMore(long n) {
281+
private void requestMore(long n) {
282282
request(n);
283283
}
284284

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ protected IndexedRingBuffer<?> createObject() {
5858
};
5959

6060
@SuppressWarnings("unchecked")
61-
public final static <T> IndexedRingBuffer<T> getInstance() {
61+
public static <T> IndexedRingBuffer<T> getInstance() {
6262
return (IndexedRingBuffer<T>) POOL.borrowObject();
6363
}
6464

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ static <T> Producer createProducer(Subscriber<? super T> s, T v) {
7878
* @param t the value to emit when requested
7979
* @return the new Observable
8080
*/
81-
public static final <T> ScalarSynchronousObservable<T> create(T t) {
81+
public static <T> ScalarSynchronousObservable<T> create(T t) {
8282
return new ScalarSynchronousObservable<T>(t);
8383
}
8484

src/main/java/rx/internal/util/atomic/SpscLinkedArrayQueue.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -242,17 +242,17 @@ private void soConsumerIndex(long v) {
242242
CONSUMER_INDEX.lazySet(this, v);
243243
}
244244

245-
private static final int calcWrappedOffset(long index, int mask) {
245+
private static int calcWrappedOffset(long index, int mask) {
246246
return calcDirectOffset((int)index & mask);
247247
}
248-
private static final int calcDirectOffset(int index) {
248+
private static int calcDirectOffset(int index) {
249249
return index;
250250
}
251-
private static final void soElement(AtomicReferenceArray<Object> buffer, int offset, Object e) {
251+
private static void soElement(AtomicReferenceArray<Object> buffer, int offset, Object e) {
252252
buffer.lazySet(offset, e);
253253
}
254254

255-
private static final <E> Object lvElement(AtomicReferenceArray<Object> buffer, int offset) {
255+
private static <E> Object lvElement(AtomicReferenceArray<Object> buffer, int offset) {
256256
return buffer.get(offset);
257257
}
258258

src/main/java/rx/internal/util/atomic/SpscUnboundedAtomicArrayQueue.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -243,17 +243,17 @@ private void soConsumerIndex(long v) {
243243
CONSUMER_INDEX.lazySet(this, v);
244244
}
245245

246-
private static final int calcWrappedOffset(long index, int mask) {
246+
private static int calcWrappedOffset(long index, int mask) {
247247
return calcDirectOffset((int)index & mask);
248248
}
249-
private static final int calcDirectOffset(int index) {
249+
private static int calcDirectOffset(int index) {
250250
return index;
251251
}
252-
private static final void soElement(AtomicReferenceArray<Object> buffer, int offset, Object e) {
252+
private static void soElement(AtomicReferenceArray<Object> buffer, int offset, Object e) {
253253
buffer.lazySet(offset, e);
254254
}
255255

256-
private static final <E> Object lvElement(AtomicReferenceArray<Object> buffer, int offset) {
256+
private static <E> Object lvElement(AtomicReferenceArray<Object> buffer, int offset) {
257257
return buffer.get(offset);
258258
}
259259

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -264,17 +264,17 @@ private void soConsumerIndex(long v) {
264264
UNSAFE.putOrderedLong(this, C_INDEX_OFFSET, v);
265265
}
266266

267-
private static final long calcWrappedOffset(long index, long mask) {
267+
private static long calcWrappedOffset(long index, long mask) {
268268
return calcDirectOffset(index & mask);
269269
}
270-
private static final long calcDirectOffset(long index) {
270+
private static long calcDirectOffset(long index) {
271271
return REF_ARRAY_BASE + (index << REF_ELEMENT_SHIFT);
272272
}
273-
private static final void soElement(Object[] buffer, long offset, Object e) {
273+
private static void soElement(Object[] buffer, long offset, Object e) {
274274
UNSAFE.putOrderedObject(buffer, offset, e);
275275
}
276276

277-
private static final <E> Object lvElement(E[] buffer, long offset) {
277+
private static <E> Object lvElement(E[] buffer, long offset) {
278278
return UNSAFE.getObjectVolatile(buffer, offset);
279279
}
280280

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ private UnsafeAccess() {
4747
UNSAFE = u;
4848
}
4949

50-
public static final boolean isUnsafeAvailable() {
50+
public static boolean isUnsafeAvailable() {
5151
return UNSAFE != null;
5252
}
5353

0 commit comments

Comments
 (0)