Skip to content

Commit 824c65a

Browse files
committed
Fixed comment typo, added the rest of the operators
1 parent 5532412 commit 824c65a

11 files changed

+69
-18
lines changed

src/main/java/rx/Observable.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2419,7 +2419,7 @@ public final static <T> Observable<Boolean> sequenceEqual(Observable<? extends T
24192419
* @see <a href="https://github.com/ReactiveX/RxJava/wiki/Combining-Observables#switchonnext">RxJava wiki: switchOnNext</a>
24202420
*/
24212421
public final static <T> Observable<T> switchOnNext(Observable<? extends Observable<? extends T>> sequenceOfSequences) {
2422-
return sequenceOfSequences.lift(new OperatorSwitch<T>());
2422+
return sequenceOfSequences.lift(OperatorSwitch.<T>instance());
24232423
}
24242424

24252425
/**
@@ -5113,7 +5113,7 @@ public final Observable<T> onBackpressureBuffer(long capacity, Action0 onOverflo
51135113
* @see <a href="https://github.com/ReactiveX/RxJava/wiki/Backpressure">RxJava wiki: Backpressure</a>
51145114
*/
51155115
public final Observable<T> onBackpressureDrop() {
5116-
return lift(new OperatorOnBackpressureDrop<T>());
5116+
return lift(OperatorOnBackpressureDrop.<T>instance());
51175117
}
51185118

51195119
/**
@@ -6463,7 +6463,7 @@ public final <R> Observable<R> scan(R initialValue, Func2<R, ? super T, R> accum
64636463
* @see <a href="https://github.com/ReactiveX/RxJava/wiki/Observable-Utility-Operators#serialize">RxJava wiki: serialize</a>
64646464
*/
64656465
public final Observable<T> serialize() {
6466-
return lift(new OperatorSerialize<T>());
6466+
return lift(OperatorSerialize.<T>instance());
64676467
}
64686468

64696469
/**
@@ -8370,7 +8370,7 @@ public final BlockingObservable<T> toBlocking() {
83708370
* @see <a href="https://github.com/ReactiveX/RxJava/wiki/Mathematical-and-Aggregate-Operators#tolist">RxJava wiki: toList</a>
83718371
*/
83728372
public final Observable<List<T>> toList() {
8373-
return lift(new OperatorToObservableList<T>());
8373+
return lift(OperatorToObservableList.<T>instance());
83748374
}
83758375

83768376
/**

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,13 @@ private static final class Holder {
3131
static final OperatorAsObservable<Object> INSTANCE = new OperatorAsObservable<Object>();
3232
}
3333
/**
34-
* @return an singleton instance of this stateless operator.
34+
* @return a singleton instance of this stateless operator.
3535
*/
3636
@SuppressWarnings("unchecked")
3737
public static <T> OperatorAsObservable<T> instance() {
3838
return (OperatorAsObservable<T>)Holder.INSTANCE;
3939
}
40+
private OperatorAsObservable() { }
4041
@Override
4142
public Subscriber<? super T> call(Subscriber<? super T> s) {
4243
return s;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@ private static final class Holder {
4343
static final OperatorConcat<Object> INSTANCE = new OperatorConcat<Object>();
4444
}
4545
/**
46-
* @return an singleton instance of this stateless operator.
46+
* @return a singleton instance of this stateless operator.
4747
*/
4848
@SuppressWarnings("unchecked")
4949
public static <T> OperatorConcat<T> instance() {
5050
return (OperatorConcat<T>)Holder.INSTANCE;
5151
}
52-
52+
private OperatorConcat() { }
5353
@Override
5454
public Subscriber<? super Observable<? extends T>> call(final Subscriber<? super T> child) {
5555
final SerializedSubscriber<T> s = new SerializedSubscriber<T>(child);

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,13 @@ private static final class Holder {
3636
static final OperatorDematerialize<Object> INSTANCE = new OperatorDematerialize<Object>();
3737
}
3838
/**
39-
* @return an singleton instance of this stateless operator.
39+
* @return a singleton instance of this stateless operator.
4040
*/
4141
@SuppressWarnings({ "rawtypes" })
4242
public static OperatorDematerialize instance() {
4343
return Holder.INSTANCE; // using raw types because the type inference is not good enough
4444
}
45+
private OperatorDematerialize() { }
4546
@Override
4647
public Subscriber<? super Notification<T>> call(final Subscriber<? super T> child) {
4748
return new Subscriber<Notification<T>>(child) {

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,13 @@ private static final class Holder {
3535
static final OperatorMaterialize<Object> INSTANCE = new OperatorMaterialize<Object>();
3636
}
3737
/**
38-
* @return an singleton instance of this stateless operator.
38+
* @return a singleton instance of this stateless operator.
3939
*/
4040
@SuppressWarnings("unchecked")
4141
public static <T> OperatorMaterialize<T> instance() {
4242
return (OperatorMaterialize<T>)Holder.INSTANCE;
4343
}
44+
private OperatorMaterialize() { }
4445
@Override
4546
public Subscriber<? super T> call(final Subscriber<? super Notification<T>> child) {
4647
return new Subscriber<T>(child) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ private static final class HolderDelayErrors {
6969
}
7070
/**
7171
* @param delayErrors should the merge delay errors?
72-
* @return an singleton instance of this stateless operator.
72+
* @return a singleton instance of this stateless operator.
7373
*/
7474
@SuppressWarnings("unchecked")
7575
public static <T> OperatorMerge<T> instance(boolean delayErrors) {

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

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,19 @@
2222
import rx.Subscriber;
2323

2424
public class OperatorOnBackpressureDrop<T> implements Operator<T, T> {
25-
25+
/** Lazy initialization via inner-class holder. */
26+
private static final class Holder {
27+
/** A singleton instance. */
28+
static final OperatorOnBackpressureDrop<Object> INSTANCE = new OperatorOnBackpressureDrop<Object>();
29+
}
30+
/**
31+
* @return a singleton instance of this stateless operator.
32+
*/
33+
@SuppressWarnings({ "unchecked" })
34+
public static <T> OperatorOnBackpressureDrop<T> instance() {
35+
return (OperatorOnBackpressureDrop<T>)Holder.INSTANCE;
36+
}
37+
private OperatorOnBackpressureDrop() { }
2638
@Override
2739
public Subscriber<? super T> call(final Subscriber<? super T> child) {
2840
final AtomicLong requested = new AtomicLong();

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

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,19 @@
2020
import rx.observers.SerializedSubscriber;
2121

2222
public final class OperatorSerialize<T> implements Operator<T, T> {
23-
23+
/** Lazy initialization via inner-class holder. */
24+
private static final class Holder {
25+
/** A singleton instance. */
26+
static final OperatorSerialize<Object> INSTANCE = new OperatorSerialize<Object>();
27+
}
28+
/**
29+
* @return a singleton instance of this stateless operator.
30+
*/
31+
@SuppressWarnings({ "unchecked" })
32+
public static <T> OperatorSerialize<T> instance() {
33+
return (OperatorSerialize<T>)Holder.INSTANCE;
34+
}
35+
private OperatorSerialize() { }
2436
@Override
2537
public Subscriber<? super T> call(final Subscriber<? super T> s) {
2638
return new SerializedSubscriber<T>(new Subscriber<T>(s) {

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

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
import java.util.ArrayList;
1919
import java.util.List;
20+
2021
import rx.Observable;
2122
import rx.Observable.Operator;
2223
import rx.Producer;
@@ -33,7 +34,19 @@
3334
* @param <T> the value type
3435
*/
3536
public final class OperatorSwitch<T> implements Operator<T, Observable<? extends T>> {
36-
37+
/** Lazy initialization via inner-class holder. */
38+
private static final class Holder {
39+
/** A singleton instance. */
40+
static final OperatorSwitch<Object> INSTANCE = new OperatorSwitch<Object>();
41+
}
42+
/**
43+
* @return a singleton instance of this stateless operator.
44+
*/
45+
@SuppressWarnings({ "unchecked" })
46+
public static <T> OperatorSwitch<T> instance() {
47+
return (OperatorSwitch<T>)Holder.INSTANCE;
48+
}
49+
private OperatorSwitch() { }
3750
@Override
3851
public Subscriber<? super Observable<? extends T>> call(final Subscriber<? super T> child) {
3952
return new SwitchSubscriber<T>(child);

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

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,19 @@
3737
* as you do not have the option to unsubscribe.
3838
*/
3939
public final class OperatorToObservableList<T> implements Operator<List<T>, T> {
40-
40+
/** Lazy initialization via inner-class holder. */
41+
private static final class Holder {
42+
/** A singleton instance. */
43+
static final OperatorToObservableList<Object> INSTANCE = new OperatorToObservableList<Object>();
44+
}
45+
/**
46+
* @return a singleton instance of this stateless operator.
47+
*/
48+
@SuppressWarnings({ "unchecked" })
49+
public static <T> OperatorToObservableList<T> instance() {
50+
return (OperatorToObservableList<T>)Holder.INSTANCE;
51+
}
52+
private OperatorToObservableList() { }
4153
@Override
4254
public Subscriber<? super T> call(final Subscriber<? super List<T>> o) {
4355
return new Subscriber<T>(o) {

0 commit comments

Comments
 (0)