Skip to content

Commit 9ca507f

Browse files
JakeWhartonakarnokd
JakeWharton
authored and
akarnokd
committed
Rename source/publisher wrapper class to more semantic 'from' name. (ReactiveX#4305)
1 parent 5273cf0 commit 9ca507f

File tree

8 files changed

+42
-42
lines changed

8 files changed

+42
-42
lines changed

‎src/main/java/io/reactivex/Completable.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public abstract class Completable implements CompletableSource {
3939
static final Completable NEVER = new CompletableNever();
4040

4141
/**
42-
* Wraps the given CompletableConsumable into a Completable
42+
* Wraps the given CompletableSource into a Completable
4343
* if not already Completable.
4444
* @param source the source to wrap
4545
* @return the source or its wrapper Completable
@@ -50,7 +50,7 @@ public static Completable wrap(CompletableSource source) {
5050
if (source instanceof Completable) {
5151
return (Completable)source;
5252
}
53-
return new CompletableWrapper(source);
53+
return new CompletableFromSource(source);
5454
}
5555

5656
/**
@@ -155,22 +155,22 @@ public static Completable concat(Publisher<? extends CompletableSource> sources,
155155
}
156156

157157
/**
158-
* Constructs a Completable instance by wrapping the given onSubscribe callback.
159-
* @param onSubscribe the callback which will receive the CompletableSubscriber instances
158+
* Constructs a Completable instance by wrapping the given source callback.
159+
* @param source the callback which will receive the CompletableObserver instances
160160
* when the Completable is subscribed to.
161161
* @return the created Completable instance
162-
* @throws NullPointerException if onSubscribe is null
162+
* @throws NullPointerException if source is null
163163
*/
164164
@SchedulerSupport(SchedulerSupport.NONE)
165-
public static Completable create(CompletableSource onSubscribe) {
166-
Objects.requireNonNull(onSubscribe, "onSubscribe is null");
167-
if (onSubscribe instanceof Completable) {
165+
public static Completable create(CompletableSource source) {
166+
Objects.requireNonNull(source, "source is null");
167+
if (source instanceof Completable) {
168168
throw new IllegalArgumentException("Use of create(Completable)!");
169169
}
170170
try {
171-
// TODO plugin wrapping onSubscribe
171+
// TODO plugin wrapping source
172172

173-
return RxJavaPlugins.onAssembly(new CompletableWrapper(onSubscribe));
173+
return RxJavaPlugins.onAssembly(new CompletableFromSource(source));
174174
} catch (NullPointerException ex) { // NOPMD
175175
throw ex;
176176
} catch (Throwable ex) {

‎src/main/java/io/reactivex/Flowable.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ public static <T> Flowable<T> fromPublisher(final Publisher<? extends T> publish
582582
}
583583
Objects.requireNonNull(publisher, "publisher is null");
584584

585-
return new FlowableWrapper<T>(publisher);
585+
return new FlowableFromPublisher<T>(publisher);
586586
}
587587

588588
@BackpressureSupport(BackpressureKind.FULL)

‎src/main/java/io/reactivex/Observable.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -327,18 +327,18 @@ public static <T> Observable<T> concatArray(ObservableSource<? extends T>... sou
327327
return fromArray(sources).concatMap((Function)Functions.identity());
328328
}
329329

330-
public static <T> Observable<T> create(ObservableSource<T> onSubscribe) {
331-
Objects.requireNonNull(onSubscribe, "onSubscribe is null");
332-
return new ObservableWrapper<T>(onSubscribe);
330+
public static <T> Observable<T> create(ObservableSource<T> source) {
331+
Objects.requireNonNull(source, "source is null");
332+
return new ObservableFromSource<T>(source);
333333
}
334334

335-
public static <T> Observable<T> wrap(ObservableSource<T> onSubscribe) {
336-
Objects.requireNonNull(onSubscribe, "onSubscribe is null");
335+
public static <T> Observable<T> wrap(ObservableSource<T> source) {
336+
Objects.requireNonNull(source, "source is null");
337337
// TODO plugin wrapper?
338-
if (onSubscribe instanceof Observable) {
339-
return (Observable<T>)onSubscribe;
338+
if (source instanceof Observable) {
339+
return (Observable<T>)source;
340340
}
341-
return new ObservableWrapper<T>(onSubscribe);
341+
return new ObservableFromSource<T>(source);
342342
}
343343

344344
@SchedulerSupport(SchedulerSupport.NONE)

‎src/main/java/io/reactivex/Single.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ static <T> Single<T> wrap(SingleSource<T> source) {
4242
if (source instanceof Single) {
4343
return (Single<T>)source;
4444
}
45-
return new SingleWrapper<T>(source);
45+
return new SingleFromSource<T>(source);
4646
}
4747

4848
public static <T> Single<T> amb(final Iterable<? extends SingleSource<? extends T>> sources) {
@@ -195,10 +195,10 @@ public static <T> Flowable<T> concat(
195195
return concat(Flowable.fromArray(s1, s2, s3, s4, s5, s6, s7, s8, s9));
196196
}
197197

198-
public static <T> Single<T> create(SingleSource<T> onSubscribe) {
199-
Objects.requireNonNull(onSubscribe, "onSubscribe is null");
198+
public static <T> Single<T> create(SingleSource<T> source) {
199+
Objects.requireNonNull(source, "source is null");
200200
// TODO plugin wrapper
201-
return new SingleWrapper<T>(onSubscribe);
201+
return new SingleFromSource<T>(source);
202202
}
203203

204204
public static <T> Single<T> defer(final Callable<? extends SingleSource<? extends T>> singleSupplier) {

src/main/java/io/reactivex/internal/operators/completable/CompletableWrapper.java renamed to src/main/java/io/reactivex/internal/operators/completable/CompletableFromSource.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@
1515

1616
import io.reactivex.*;
1717

18-
public final class CompletableWrapper extends Completable {
18+
public final class CompletableFromSource extends Completable {
1919

20-
final CompletableSource onSubscribe;
20+
final CompletableSource source;
2121

22-
public CompletableWrapper(CompletableSource onSubscribe) {
23-
this.onSubscribe = onSubscribe;
22+
public CompletableFromSource(CompletableSource source) {
23+
this.source = source;
2424
}
2525

2626
@Override
27-
protected void subscribeActual(CompletableObserver s) {
28-
onSubscribe.subscribe(s);
27+
protected void subscribeActual(CompletableObserver observer) {
28+
source.subscribe(observer);
2929
}
3030
}

src/main/java/io/reactivex/internal/operators/flowable/FlowableWrapper.java renamed to src/main/java/io/reactivex/internal/operators/flowable/FlowableFromPublisher.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717

1818
import io.reactivex.Flowable;
1919

20-
public final class FlowableWrapper<T> extends Flowable<T> {
20+
public final class FlowableFromPublisher<T> extends Flowable<T> {
2121
final Publisher<? extends T> publisher;
2222

23-
public FlowableWrapper(Publisher<? extends T> publisher) {
23+
public FlowableFromPublisher(Publisher<? extends T> publisher) {
2424
this.publisher = publisher;
2525
}
2626

src/main/java/io/reactivex/internal/operators/observable/ObservableWrapper.java renamed to src/main/java/io/reactivex/internal/operators/observable/ObservableFromSource.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515

1616
import io.reactivex.*;
1717

18-
public final class ObservableWrapper<T> extends Observable<T> {
19-
final ObservableSource<T> onSubscribe;
18+
public final class ObservableFromSource<T> extends Observable<T> {
19+
final ObservableSource<T> source;
2020

21-
public ObservableWrapper(ObservableSource<T> onSubscribe) {
22-
this.onSubscribe = onSubscribe;
21+
public ObservableFromSource(ObservableSource<T> source) {
22+
this.source = source;
2323
}
2424

2525
@Override
2626
protected void subscribeActual(Observer<? super T> observer) {
27-
onSubscribe.subscribe(observer);
27+
source.subscribe(observer);
2828
}
2929
}

src/main/java/io/reactivex/internal/operators/single/SingleWrapper.java renamed to src/main/java/io/reactivex/internal/operators/single/SingleFromSource.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515

1616
import io.reactivex.*;
1717

18-
public final class SingleWrapper<T> extends Single<T> {
19-
final SingleSource<T> onSubscribe;
18+
public final class SingleFromSource<T> extends Single<T> {
19+
final SingleSource<T> source;
2020

21-
public SingleWrapper(SingleSource<T> onSubscribe) {
22-
this.onSubscribe = onSubscribe;
21+
public SingleFromSource(SingleSource<T> source) {
22+
this.source = source;
2323
}
2424

2525
@Override
26-
protected void subscribeActual(SingleObserver<? super T> subscriber) {
27-
onSubscribe.subscribe(subscriber);
26+
protected void subscribeActual(SingleObserver<? super T> observer) {
27+
source.subscribe(observer);
2828
}
2929
}

0 commit comments

Comments
 (0)