Skip to content

Commit 2e566fb

Browse files
authored
2.x: Cleanup multiple empty lines in sources (ReactiveX#6182)
1 parent 13f7b01 commit 2e566fb

File tree

182 files changed

+134
-277
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

182 files changed

+134
-277
lines changed

gradle/stylesheet.css

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,6 @@ td.colLast div {
534534
padding-top:0px;
535535
}
536536

537-
538537
td.colLast a {
539538
padding-bottom:3px;
540539
}

src/jmh/java/io/reactivex/XMapYPerf.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ public class XMapYPerf {
9494

9595
Observable<Integer> obsFlatMapIterableAsObs0;
9696

97-
9897
@Setup
9998
public void setup() {
10099
Integer[] values = new Integer[times];
@@ -158,7 +157,6 @@ public Iterable<Integer> apply(Integer v) throws Exception {
158157
}
159158
});
160159

161-
162160
flowFlatMapSingle1 = fsource.flatMapSingle(new Function<Integer, SingleSource<Integer>>() {
163161
@Override
164162
public SingleSource<Integer> apply(Integer v) throws Exception {
@@ -231,7 +229,6 @@ public Publisher<Integer> apply(Integer v) throws Exception {
231229
}
232230
});
233231

234-
235232
// -------------------------------------------------------------------
236233

237234
Observable<Integer> osource = Observable.fromArray(values);
@@ -271,7 +268,6 @@ public MaybeSource<Integer> apply(Integer v) throws Exception {
271268
}
272269
});
273270

274-
275271
obsFlatMapCompletable0 = osource.flatMapCompletable(new Function<Integer, CompletableSource>() {
276272
@Override
277273
public CompletableSource apply(Integer v) throws Exception {

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,6 @@ public static Completable error(final Throwable error) {
388388
return RxJavaPlugins.onAssembly(new CompletableError(error));
389389
}
390390

391-
392391
/**
393392
* Returns a Completable instance that runs the given Action for each subscriber and
394393
* emits either an unchecked exception or simply completes.
@@ -790,7 +789,6 @@ public static Completable mergeDelayError(Iterable<? extends CompletableSource>
790789
return RxJavaPlugins.onAssembly(new CompletableMergeDelayErrorIterable(sources));
791790
}
792791

793-
794792
/**
795793
* Returns a Completable that subscribes to all Completables in the source sequence and delays
796794
* any error emitted by either the sources observable or any of the inner Completables until all of

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3474,7 +3474,6 @@ public static <T> Flowable<T> mergeDelayError(Iterable<? extends Publisher<? ext
34743474
return fromIterable(sources).flatMap((Function)Functions.identity(), true);
34753475
}
34763476

3477-
34783477
/**
34793478
* Flattens an Iterable of Publishers into one Publisher, in a way that allows a Subscriber to receive all
34803479
* successfully emitted items from each of the source Publishers without being interrupted by an error
@@ -3787,7 +3786,6 @@ public static <T> Flowable<T> mergeDelayError(Publisher<? extends T> source1, Pu
37873786
return fromArray(source1, source2, source3).flatMap((Function)Functions.identity(), true, 3);
37883787
}
37893788

3790-
37913789
/**
37923790
* Flattens four Publishers into one Publisher, in a way that allows a Subscriber to receive all
37933791
* successfully emitted items from all of the source Publishers without being interrupted by an error
@@ -4629,7 +4627,6 @@ public static <T1, T2, R> Flowable<R> zip(
46294627
return zipArray(Functions.toFunction(zipper), delayError, bufferSize(), source1, source2);
46304628
}
46314629

4632-
46334630
/**
46344631
* Returns a Flowable that emits the results of a specified combiner function applied to combinations of
46354632
* two items emitted, in sequence, by two other Publishers.
@@ -7357,7 +7354,6 @@ public final <R> Flowable<R> concatMapDelayError(Function<? super T, ? extends P
73577354
return RxJavaPlugins.onAssembly(new FlowableConcatMap<T, R>(this, mapper, prefetch, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY));
73587355
}
73597356

7360-
73617357
/**
73627358
* Maps a sequence of values into Publishers and concatenates these Publishers eagerly into a single
73637359
* Publisher.
@@ -10749,7 +10745,6 @@ public final <TRight, TLeftEnd, TRightEnd, R> Flowable<R> join(
1074910745
this, other, leftEnd, rightEnd, resultSelector));
1075010746
}
1075110747

10752-
1075310748
/**
1075410749
* Returns a Maybe that emits the last item emitted by this Flowable or completes if
1075510750
* this Flowable is empty.
@@ -14703,7 +14698,6 @@ public final <R> Flowable<R> switchMap(Function<? super T, ? extends Publisher<?
1470314698
return switchMap0(mapper, bufferSize, false);
1470414699
}
1470514700

14706-
1470714701
/**
1470814702
* Maps the upstream values into {@link CompletableSource}s, subscribes to the newer one while
1470914703
* disposing the subscription to the previous {@code CompletableSource}, thus keeping at most one

src/main/java/io/reactivex/Maybe.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -839,7 +839,6 @@ public static <T> Maybe<T> fromRunnable(final Runnable run) {
839839
return RxJavaPlugins.onAssembly(new MaybeFromRunnable<T>(run));
840840
}
841841

842-
843842
/**
844843
* Returns a {@code Maybe} that emits a specified item.
845844
* <p>
@@ -1238,7 +1237,6 @@ public static <T> Flowable<T> mergeArrayDelayError(MaybeSource<? extends T>... s
12381237
return Flowable.fromArray(sources).flatMap((Function)MaybeToPublisher.instance(), true, sources.length);
12391238
}
12401239

1241-
12421240
/**
12431241
* Flattens an Iterable of MaybeSources into one Flowable, in a way that allows a Subscriber to receive all
12441242
* successfully emitted items from each of the source MaybeSources without being interrupted by an error
@@ -1274,7 +1272,6 @@ public static <T> Flowable<T> mergeDelayError(Iterable<? extends MaybeSource<? e
12741272
return Flowable.fromIterable(sources).flatMap((Function)MaybeToPublisher.instance(), true);
12751273
}
12761274

1277-
12781275
/**
12791276
* Flattens a Publisher that emits MaybeSources into one Publisher, in a way that allows a Subscriber to
12801277
* receive all successfully emitted items from all of the source MaybeSources without being interrupted by
@@ -1310,7 +1307,6 @@ public static <T> Flowable<T> mergeDelayError(Publisher<? extends MaybeSource<?
13101307
return mergeDelayError(sources, Integer.MAX_VALUE);
13111308
}
13121309

1313-
13141310
/**
13151311
* Flattens a Publisher that emits MaybeSources into one Publisher, in a way that allows a Subscriber to
13161312
* receive all successfully emitted items from all of the source MaybeSources without being interrupted by
@@ -1432,7 +1428,6 @@ public static <T> Flowable<T> mergeDelayError(MaybeSource<? extends T> source1,
14321428
return mergeArrayDelayError(source1, source2, source3);
14331429
}
14341430

1435-
14361431
/**
14371432
* Flattens four MaybeSources into one Flowable, in a way that allows a Subscriber to receive all
14381433
* successfully emitted items from all of the source MaybeSources without being interrupted by an error
@@ -1503,7 +1498,6 @@ public static <T> Maybe<T> never() {
15031498
return RxJavaPlugins.onAssembly((Maybe<T>)MaybeNever.INSTANCE);
15041499
}
15051500

1506-
15071501
/**
15081502
* Returns a Single that emits a Boolean value that indicates whether two MaybeSource sequences are the
15091503
* same by comparing the items emitted by each MaybeSource pairwise.
@@ -2388,7 +2382,6 @@ public final <R> Maybe<R> concatMap(Function<? super T, ? extends MaybeSource<?
23882382
return RxJavaPlugins.onAssembly(new MaybeFlatten<T, R>(this, mapper));
23892383
}
23902384

2391-
23922385
/**
23932386
* Returns a Flowable that emits the items emitted from the current MaybeSource, then the next, one after
23942387
* the other, without interleaving them.
@@ -2486,7 +2479,6 @@ public final Maybe<T> defaultIfEmpty(T defaultItem) {
24862479
return switchIfEmpty(just(defaultItem));
24872480
}
24882481

2489-
24902482
/**
24912483
* Returns a Maybe that signals the events emitted by the source Maybe shifted forward in time by a
24922484
* specified delay.
@@ -3838,7 +3830,6 @@ public final Flowable<T> repeatWhen(final Function<? super Flowable<Object>, ? e
38383830
return toFlowable().repeatWhen(handler);
38393831
}
38403832

3841-
38423833
/**
38433834
* Returns a Maybe that mirrors the source Maybe, resubscribing to it if it calls {@code onError}
38443835
* (infinite retry count).

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5429,7 +5429,6 @@ public final void blockingSubscribe(Consumer<? super T> onNext, Consumer<? super
54295429
ObservableBlockingSubscribe.subscribe(this, onNext, onError, Functions.EMPTY_ACTION);
54305430
}
54315431

5432-
54335432
/**
54345433
* Subscribes to the source and calls the given callbacks <strong>on the current thread</strong>.
54355434
* <p>

src/main/java/io/reactivex/Scheduler.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@ public static long clockDriftTolerance() {
110110
return CLOCK_DRIFT_TOLERANCE_NANOSECONDS;
111111
}
112112

113-
114113
/**
115114
* Retrieves or creates a new {@link Scheduler.Worker} that represents sequential execution of actions.
116115
* <p>

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1072,7 +1072,6 @@ public static <T> Flowable<T> merge(
10721072
return merge(Flowable.fromArray(source1, source2, source3, source4));
10731073
}
10741074

1075-
10761075
/**
10771076
* Merges an Iterable sequence of SingleSource instances into a single Flowable sequence,
10781077
* running all SingleSources at once and delaying any error(s) until all sources succeed or fail.
@@ -1121,7 +1120,6 @@ public static <T> Flowable<T> mergeDelayError(Publisher<? extends SingleSource<?
11211120
return RxJavaPlugins.onAssembly(new FlowableFlatMapPublisher(sources, SingleInternalHelper.toFlowable(), true, Integer.MAX_VALUE, Flowable.bufferSize()));
11221121
}
11231122

1124-
11251123
/**
11261124
* Flattens two Singles into a single Flowable, without any transformation, delaying
11271125
* any error(s) until all sources succeed or fail.

src/main/java/io/reactivex/internal/disposables/CancellableDisposable.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
public final class CancellableDisposable extends AtomicReference<Cancellable>
2929
implements Disposable {
3030

31-
3231
private static final long serialVersionUID = 5718521705281392066L;
3332

3433
public CancellableDisposable(Cancellable cancellable) {

src/main/java/io/reactivex/internal/disposables/DisposableHelper.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import io.reactivex.internal.functions.ObjectHelper;
2121
import io.reactivex.plugins.RxJavaPlugins;
2222

23-
2423
/**
2524
* Utility methods for working with Disposables atomically.
2625
*/

0 commit comments

Comments
 (0)