Skip to content

Commit f671b57

Browse files
authored
2.x: Fix JavaDoc warnings of buffer(Publisher|Callable) (#5923)
1 parent 8a6bf14 commit f671b57

File tree

2 files changed

+12
-10
lines changed

2 files changed

+12
-10
lines changed

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

+6-5
Original file line numberDiff line numberDiff line change
@@ -6516,9 +6516,10 @@ public final <B, U extends Collection<? super T>> Flowable<U> buffer(Publisher<B
65166516
* new buffer whenever the Publisher produced by the specified {@code boundaryIndicatorSupplier} emits an item.
65176517
* <p>
65186518
* <img width="640" height="395" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer1.png" alt="">
6519-
* <dl>
6520-
* If either the source Publisher or the boundary Publisher issues an onError notification the event is passed on
6519+
* <p>
6520+
* If either the source {@code Publisher} or the boundary {@code Publisher} issues an {@code onError} notification the event is passed on
65216521
* immediately without first emitting the buffer it is in the process of assembling.
6522+
* <dl>
65226523
* <dt><b>Backpressure:</b></dt>
65236524
* <dd>This operator does not support backpressure as it is instead controlled by the given Publishers and
65246525
* buffers data. It requests {@code Long.MAX_VALUE} upstream and does not obey downstream requests.</dd>
@@ -6540,7 +6541,6 @@ public final <B, U extends Collection<? super T>> Flowable<U> buffer(Publisher<B
65406541
@SchedulerSupport(SchedulerSupport.NONE)
65416542
public final <B> Flowable<List<T>> buffer(Callable<? extends Publisher<B>> boundaryIndicatorSupplier) {
65426543
return buffer(boundaryIndicatorSupplier, ArrayListSupplier.<T>asCallable());
6543-
65446544
}
65456545

65466546
/**
@@ -6549,9 +6549,10 @@ public final <B> Flowable<List<T>> buffer(Callable<? extends Publisher<B>> bound
65496549
* new buffer whenever the Publisher produced by the specified {@code boundaryIndicatorSupplier} emits an item.
65506550
* <p>
65516551
* <img width="640" height="395" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer1.png" alt="">
6552-
* <dl>
6553-
* If either the source Publisher or the boundary Publisher issues an onError notification the event is passed on
6552+
* <p>
6553+
* If either the source {@code Publisher} or the boundary {@code Publisher} issues an {@code onError} notification the event is passed on
65546554
* immediately without first emitting the buffer it is in the process of assembling.
6555+
* <dl>
65556556
* <dt><b>Backpressure:</b></dt>
65566557
* <dd>This operator does not support backpressure as it is instead controlled by the given Publishers and
65576558
* buffers data. It requests {@code Long.MAX_VALUE} upstream and does not obey downstream requests.</dd>

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

+6-5
Original file line numberDiff line numberDiff line change
@@ -5952,9 +5952,10 @@ public final <B, U extends Collection<? super T>> Observable<U> buffer(Observabl
59525952
* new buffer whenever the ObservableSource produced by the specified {@code boundarySupplier} emits an item.
59535953
* <p>
59545954
* <img width="640" height="395" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer1.png" alt="">
5955-
* <dl>
5956-
* If either the source ObservableSource or the boundary ObservableSource issues an onError notification the event
5955+
* <p>
5956+
* If either the source {@code ObservableSource} or the boundary {@code ObservableSource} issues an {@code onError} notification the event
59575957
* is passed on immediately without first emitting the buffer it is in the process of assembling.
5958+
* <dl>
59585959
* <dt><b>Scheduler:</b></dt>
59595960
* <dd>This version of {@code buffer} does not operate by default on a particular {@link Scheduler}.</dd>
59605961
* </dl>
@@ -5972,7 +5973,6 @@ public final <B, U extends Collection<? super T>> Observable<U> buffer(Observabl
59725973
@SchedulerSupport(SchedulerSupport.NONE)
59735974
public final <B> Observable<List<T>> buffer(Callable<? extends ObservableSource<B>> boundarySupplier) {
59745975
return buffer(boundarySupplier, ArrayListSupplier.<T>asCallable());
5975-
59765976
}
59775977

59785978
/**
@@ -5981,9 +5981,10 @@ public final <B> Observable<List<T>> buffer(Callable<? extends ObservableSource<
59815981
* new buffer whenever the ObservableSource produced by the specified {@code boundarySupplier} emits an item.
59825982
* <p>
59835983
* <img width="640" height="395" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer1.png" alt="">
5984-
* <dl>
5985-
* If either the source ObservableSource or the boundary ObservableSource issues an onError notification the event
5984+
* <p>
5985+
* If either the source {@code ObservableSource} or the boundary {@code ObservableSource} issues an {@code onError} notification the event
59865986
* is passed on immediately without first emitting the buffer it is in the process of assembling.
5987+
* <dl>
59875988
* <dt><b>Scheduler:</b></dt>
59885989
* <dd>This version of {@code buffer} does not operate by default on a particular {@link Scheduler}.</dd>
59895990
* </dl>

0 commit comments

Comments
 (0)